Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

Conflicts:
	cmds/bootanimation/BootAnimation.cpp
	core/java/android/accounts/AccountManager.java
	core/java/android/app/AppOpsManager.java
	core/java/android/os/PowerManagerInternal.java
	core/java/android/os/storage/IMountService.java
	core/java/android/provider/Settings.java
	core/java/com/android/internal/widget/ILockSettings.aidl
	core/res/res/values-mcc204-mnc12/config.xml
	core/res/res/values-mcc219-mnc02/config.xml
	core/res/res/values-mcc730-mnc07/config.xml
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/src/com/android/systemui/doze/DozeService.java
	packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
	packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
	packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
	services/core/java/com/android/server/LocationManagerService.java
	services/core/java/com/android/server/am/ActivityManagerService.java
	services/core/java/com/android/server/pm/PackageManagerService.java
	services/core/java/com/android/server/power/PowerManagerService.java
	telecomm/java/android/telecom/Phone.java
	telephony/java/android/telephony/CarrierConfigManager.java
	telephony/java/android/telephony/RadioAccessFamily.java
	telephony/java/android/telephony/ServiceState.java
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/ims/ImsCallProfile.java
	telephony/java/com/android/ims/ImsReasonInfo.java
	telephony/java/com/android/ims/ImsSuppServiceNotification.aidl
	telephony/java/com/android/ims/ImsSuppServiceNotification.java
	telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
	telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959

1 files changed, 1 insertions, 15 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
index ef3ad10..9897098 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -34,7 +34,7 @@ public class DozeParameters {
     private static final String TAG = "DozeParameters";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    private static final int MAX_DURATION = 10 * 1000;
+    private static final int MAX_DURATION = 60 * 1000;
 
     private final Context mContext;
 
@@ -53,9 +53,6 @@ public class DozeParameters {
         pw.print("    getPulseInDuration(notification): "); pw.println(getPulseInDuration(DozeLog.PULSE_REASON_NOTIFICATION));
         pw.print("    getPulseInDuration(pickup): "); pw.println(getPulseInDuration(DozeLog.PULSE_REASON_SENSOR_PICKUP));
         pw.print("    getPulseInDuration(intent): "); pw.println(getPulseInDuration(DozeLog.PULSE_REASON_INTENT));
-        pw.print("    getPulseInDelay(notification): "); pw.println(getPulseInDelay(DozeLog.PULSE_REASON_NOTIFICATION));
-        pw.print("    getPulseInDelay(pickup): "); pw.println(getPulseInDelay(DozeLog.PULSE_REASON_SENSOR_PICKUP));
-        pw.print("    getPulseInDelay(intent): "); pw.println(getPulseInDelay(DozeLog.PULSE_REASON_INTENT));
         pw.print("    getPulseInVisibleDuration(): "); pw.println(getPulseVisibleDuration());
         pw.print("    getPulseOutDuration(): "); pw.println(getPulseOutDuration());
         pw.print("    getPulseOnSigMotion(): "); pw.println(getPulseOnSigMotion());
@@ -90,17 +87,6 @@ public class DozeParameters {
         }
     }
 
-    public int getPulseInDelay(int reason) {
-        switch(reason) {
-        case DozeLog.PULSE_REASON_SENSOR_PICKUP:
-                return getInt("doze.pulse.delay.in.pickup", R.integer.doze_pulse_delay_in_pickup);
-        case DozeLog.PULSE_REASON_INTENT:
-                return getInt("doze.pulse.delay.in.intent", R.integer.doze_pulse_delay_in_intent);
-        default:
-                return getInt("doze.pulse.delay.in", R.integer.doze_pulse_delay_in);
-        }
-    }
-
     public int getPulseVisibleDuration() {
         return getInt("doze.pulse.duration.visible", R.integer.doze_pulse_duration_visible);
     }