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

2 files changed, 17 insertions, 2 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java b/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java
index 89a2c74..82a1bfe 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java
@@ -29,6 +29,7 @@ public interface DozeHost {
     void stopDozing();
     boolean isPowerSaveActive();
     boolean isNotificationLightOn();
+    boolean isPulsingBlocked();
 
     public interface Callback {
         void onNewNotifications();
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
index bc2af99..f223400 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
@@ -88,6 +88,7 @@ public class DozeService extends DreamService {
     private boolean mPowerSaveActive;
     private boolean mCarMode;
     private long mNotificationPulseTime;
+    private long mLastScheduleResetTime;
     private long mEarliestPulseDueToLight;
     private int mScheduleResetsRemaining;
 
@@ -255,6 +256,11 @@ public class DozeService extends DreamService {
     }
 
     private void continuePulsing(int reason) {
+        if (mHost.isPulsingBlocked()) {
+            mPulsing = false;
+            mWakeLock.release();
+            return;
+        }
         mHost.pulseWhileDozing(new DozeHost.PulseCallback() {
             @Override
             public void onPulseStarted() {
@@ -352,13 +358,21 @@ public class DozeService extends DreamService {
             return;
         }
         final long pulseDuration = mDozeParameters.getPulseDuration(DozeLog.PULSE_REASON_NOTIFICATION);
-        if ((notificationTimeMs - mNotificationPulseTime) < pulseDuration) {
+        boolean pulseImmediately = System.currentTimeMillis() >= notificationTimeMs;
+        if ((notificationTimeMs - mLastScheduleResetTime) >= pulseDuration) {
+            mScheduleResetsRemaining--;
+            mLastScheduleResetTime = notificationTimeMs;
+        } else if (!pulseImmediately){
             if (DEBUG) Log.d(mTag, "Recently updated, not resetting schedule");
             return;
         }
-        mScheduleResetsRemaining--;
         if (DEBUG) Log.d(mTag, "mScheduleResetsRemaining = " + mScheduleResetsRemaining);
         mNotificationPulseTime = notificationTimeMs;
+        if (pulseImmediately) {
+            DozeLog.traceNotificationPulse(0);
+            requestPulse(DozeLog.PULSE_REASON_NOTIFICATION);
+        }
+        // schedule the rest of the pulses
         rescheduleNotificationPulse(true /*predicate*/);
     }