Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08fcdd98 authored Jun 26, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Jun 26, 2019

Merge "Fix notification stuck on AOD" into qt-r1-dev

parents d2310e6c 940503e0

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -149,6 +149,14 @@ public class DozeScrimController implements StateListener {
	mHandler.removeCallbacks(mPulseOut);		mHandler.removeCallbacks(mPulseOut);
	}		}

			/**
			* When pulsing, cancel any timeouts that would take you out of the pulsing state.
			*/
			public void cancelPendingPulseTimeout() {
			mHandler.removeCallbacks(mPulseOut);
			mHandler.removeCallbacks(mPulseOutExtended);
			}

	private void cancelPulsing() {		private void cancelPulsing() {
	if (mPulseCallback != null) {		if (mPulseCallback != null) {
	if (DEBUG) Log.d(TAG, "Cancel pulsing");		if (DEBUG) Log.d(TAG, "Cancel pulsing");

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1566,9 +1566,10 @@ public class StatusBar extends SystemUI implements DemoMode,
	@Override		@Override
	public void onHeadsUpStateChanged(NotificationEntry entry, boolean isHeadsUp) {		public void onHeadsUpStateChanged(NotificationEntry entry, boolean isHeadsUp) {
	mEntryManager.updateNotifications();		mEntryManager.updateNotifications();
	if (isDozing()) {		if (isDozing() && isHeadsUp) {
	if (isHeadsUp) {
	mDozeServiceHost.fireNotificationPulse();		mDozeServiceHost.fireNotificationPulse();
			if (mPulsing) {
			mDozeScrimController.cancelPendingPulseTimeout();
	}		}
	}		}
	if (!isHeadsUp && !mHeadsUpManager.hasNotifications()) {		if (!isHeadsUp && !mHeadsUpManager.hasNotifications()) {