Merge "Don't reset mPendingPinLock on keyguardGoingAway" into udc-dev (0c820c1e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1253,7 +1253,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		@Override
		public void onPrimaryBouncerShowingChanged() {
		synchronized (KeyguardViewMediator.this) {
		if (mKeyguardStateController.isPrimaryBouncerShowing()) {
		if (mKeyguardStateController.isPrimaryBouncerShowing()
		&& !mKeyguardStateController.isKeyguardGoingAway()) {
		mPendingPinLock = false;
		}
		adjustStatusBarLocked(mKeyguardStateController.isPrimaryBouncerShowing(), false);

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+33 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,8 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
		private @Mock ShadeWindowLogger mShadeWindowLogger;
		private @Captor ArgumentCaptor<KeyguardUpdateMonitorCallback>
		mKeyguardUpdateMonitorCallbackCaptor;
		private @Captor ArgumentCaptor<KeyguardStateController.Callback>
		mKeyguardStateControllerCallback;
		private DeviceConfigProxy mDeviceConfig = new DeviceConfigProxyFake();
		private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock());

		@@ -662,6 +664,33 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
		);
		}

		@Test
		@TestableLooper.RunWithLooper(setAsMainLooper = true)
		public void pendingPinLockOnKeyguardGoingAway_doKeyguardLockedOnKeyguardVisibilityChanged() {
		// GIVEN SIM_STATE_PIN_REQUIRED
		mViewMediator.onSystemReady();
		final KeyguardUpdateMonitorCallback keyguardUpdateMonitorCallback =
		mViewMediator.mUpdateCallback;
		keyguardUpdateMonitorCallback.onSimStateChanged(0, 0,
		TelephonyManager.SIM_STATE_PIN_REQUIRED);
		TestableLooper.get(this).processAllMessages();

		// ...and then the primary bouncer shows while the keyguard is going away
		captureKeyguardStateControllerCallback();
		when(mKeyguardStateController.isPrimaryBouncerShowing()).thenReturn(true);
		when(mKeyguardStateController.isKeyguardGoingAway()).thenReturn(true);
		mKeyguardStateControllerCallback.getValue().onPrimaryBouncerShowingChanged();
		TestableLooper.get(this).processAllMessages();

		// WHEN keyguard visibility becomes FALSE
		mViewMediator.setShowingLocked(false);
		keyguardUpdateMonitorCallback.onKeyguardVisibilityChanged(false);
		TestableLooper.get(this).processAllMessages();

		// THEN keyguard shows due to the pending SIM PIN lock
		assertTrue(mViewMediator.isShowingAndNotOccluded());
		}

		private void createAndStartViewMediator() {
		mViewMediator = new KeyguardViewMediator(
		mContext,
		@@ -708,4 +737,8 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
		private void captureKeyguardUpdateMonitorCallback() {
		verify(mUpdateMonitor).registerCallback(mKeyguardUpdateMonitorCallbackCaptor.capture());
		}

		private void captureKeyguardStateControllerCallback() {
		verify(mKeyguardStateController).addCallback(mKeyguardStateControllerCallback.capture());
		}
		}