Merge "Don't update persistent msgs when dozing" (69c9f3be) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -327,7 +327,9 @@ public class KeyguardIndicationController {
		private void updateOrganizedOwnedDevice() {
		// avoid calling this method since it has an IPC
		mOrganizationOwnedDevice = whitelistIpcs(this::isOrganizationOwnedDevice);
		updatePersistentIndications(false, KeyguardUpdateMonitor.getCurrentUser());
		if (!mDozing) {
		updateDisclosure();
		}
		}

		private void updateDisclosure() {
		@@ -1185,7 +1187,7 @@ public class KeyguardIndicationController {
		mTopIndicationView.clearMessages();
		mRotateTextViewController.clearMessages();
		} else {
		updatePersistentIndications(false, KeyguardUpdateMonitor.getCurrentUser());
		updateIndication(false);
		}
		}
		};

+4 −1

Original line number	Diff line number	Diff line
		@@ -779,8 +779,11 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
		public void testOnKeyguardShowingChanged_showing_updatesPersistentMessages() {
		createController();

		// GIVEN keyguard is showing
		// GIVEN keyguard is showing and not dozing
		when(mKeyguardStateController.isShowing()).thenReturn(true);
		mController.setVisible(true);
		mExecutor.runAllReady();
		reset(mRotateTextViewController);

		// WHEN keyguard showing changed called
		mKeyguardStateControllerCallback.onKeyguardShowingChanged();