Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am: 83270333ff (fb62b6ab) · Commits · e / os / android_frameworks_base

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

+28 −8

Original line number	Original line	Diff line number	Diff line
	@@ -433,6 +433,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
	private final LockPatternUtils mLockPatternUtils;		private final LockPatternUtils mLockPatternUtils;
	private final BroadcastDispatcher mBroadcastDispatcher;		private final BroadcastDispatcher mBroadcastDispatcher;
	private boolean mKeyguardDonePending = false;		private boolean mKeyguardDonePending = false;
			private boolean mUnlockingAndWakingFromDream = false;
	private boolean mHideAnimationRun = false;		private boolean mHideAnimationRun = false;
	private boolean mHideAnimationRunning = false;		private boolean mHideAnimationRunning = false;

	@@ -806,6 +807,25 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
	mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);		mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);
	mKeyguardDisplayManager.hide();		mKeyguardDisplayManager.hide();
	mUpdateMonitor.startBiometricWatchdog();		mUpdateMonitor.startBiometricWatchdog();

			// It's possible that the device was unlocked (via BOUNCER or Fingerprint) while
			// dreaming. It's time to wake up.
			if (mUnlockingAndWakingFromDream) {
			Log.d(TAG, "waking from dream after unlock");
			mUnlockingAndWakingFromDream = false;

			if (mKeyguardStateController.isShowing()) {
			Log.d(TAG, "keyguard showing after keyguardGone, dismiss");
			mKeyguardViewControllerLazy.get()
			.notifyKeyguardAuthenticated(!mWakeAndUnlocking);
			} else {
			Log.d(TAG, "keyguard gone, waking up from dream");
			mPM.wakeUp(SystemClock.uptimeMillis(),
			mWakeAndUnlocking ? PowerManager.WAKE_REASON_BIOMETRIC
			: PowerManager.WAKE_REASON_GESTURE,
			"com.android.systemui:UNLOCK_DREAMING");
			}
			}
	Trace.endSection();		Trace.endSection();
	}		}

	@@ -2634,6 +2654,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,

	mKeyguardExitAnimationRunner = null;		mKeyguardExitAnimationRunner = null;
	mWakeAndUnlocking = false;		mWakeAndUnlocking = false;
			mUnlockingAndWakingFromDream = false;
	setPendingLock(false);		setPendingLock(false);

	// Force if we we're showing in the middle of hiding, to ensure we end up in the correct		// Force if we we're showing in the middle of hiding, to ensure we end up in the correct
	@@ -2758,7 +2779,13 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,

	mHiding = true;		mHiding = true;

	if (mShowing && !mOccluded) {		mUnlockingAndWakingFromDream = mStatusBarStateController.isDreaming()
			&& !mStatusBarStateController.isDozing();

			if ((mShowing && !mOccluded) \|\| mUnlockingAndWakingFromDream) {
			if (mUnlockingAndWakingFromDream) {
			Log.d(TAG, "hiding keyguard before waking from dream");
			}
	mKeyguardGoingAwayRunnable.run();		mKeyguardGoingAwayRunnable.run();
	} else {		} else {
	// TODO(bc-unlock): Fill parameters		// TODO(bc-unlock): Fill parameters
	@@ -2769,13 +2796,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
	null /* nonApps /, null / finishedCallback */);		null /* nonApps /, null / finishedCallback */);
	});		});
	}		}

	// It's possible that the device was unlocked (via BOUNCER or Fingerprint) while
	// dreaming. It's time to wake up.
	if (mDreamOverlayShowing) {
	mPM.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE,
	"com.android.systemui:UNLOCK_DREAMING");
	}
	}		}
	Trace.endSection();		Trace.endSection();
	}		}

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

+6 −21

Original line number	Original line	Diff line number	Diff line
	@@ -160,7 +160,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
	private KeyguardViewController mKeyguardViewController;		private KeyguardViewController mKeyguardViewController;
	private DozeScrimController mDozeScrimController;		private DozeScrimController mDozeScrimController;
	private KeyguardViewMediator mKeyguardViewMediator;		private KeyguardViewMediator mKeyguardViewMediator;
	private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
	private PendingAuthenticated mPendingAuthenticated = null;		private PendingAuthenticated mPendingAuthenticated = null;
	private boolean mHasScreenTurnedOnSinceAuthenticating;		private boolean mHasScreenTurnedOnSinceAuthenticating;
	private boolean mFadedAwayAfterWakeAndUnlock;		private boolean mFadedAwayAfterWakeAndUnlock;
	@@ -281,8 +280,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
	LatencyTracker latencyTracker,		LatencyTracker latencyTracker,
	ScreenOffAnimationController screenOffAnimationController,		ScreenOffAnimationController screenOffAnimationController,
	VibratorHelper vibrator,		VibratorHelper vibrator,
	SystemClock systemClock,		SystemClock systemClock
	StatusBarKeyguardViewManager statusBarKeyguardViewManager
	) {		) {
	mPowerManager = powerManager;		mPowerManager = powerManager;
	mUpdateMonitor = keyguardUpdateMonitor;		mUpdateMonitor = keyguardUpdateMonitor;
	@@ -310,7 +308,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
	mVibratorHelper = vibrator;		mVibratorHelper = vibrator;
	mLogger = biometricUnlockLogger;		mLogger = biometricUnlockLogger;
	mSystemClock = systemClock;		mSystemClock = systemClock;
	mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

	dumpManager.registerDumpable(getClass().getName(), this);		dumpManager.registerDumpable(getClass().getName(), this);
	}		}
	@@ -452,19 +449,8 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
	// During wake and unlock, we need to draw black before waking up to avoid abrupt		// During wake and unlock, we need to draw black before waking up to avoid abrupt
	// brightness changes due to display state transitions.		// brightness changes due to display state transitions.
	Runnable wakeUp = ()-> {		Runnable wakeUp = ()-> {
	// Check to see if we are still locked when we are waking and unlocking from dream.		if (!wasDeviceInteractive \|\| mUpdateMonitor.isDreaming()) {
	// This runnable should be executed after unlock. If that's true, we could be not
	// dreaming, but still locked. In this case, we should attempt to authenticate instead
	// of waking up.
	if (mode == MODE_WAKE_AND_UNLOCK_FROM_DREAM
	&& !mKeyguardStateController.isUnlocked()
	&& !mUpdateMonitor.isDreaming()) {
	// Post wakeUp runnable is called from a callback in keyguard.
	mHandler.post(() -> mKeyguardViewController.notifyKeyguardAuthenticated(
	false /* primaryAuth */));
	} else if (!wasDeviceInteractive \|\| mUpdateMonitor.isDreaming()) {
	mLogger.i("bio wakelock: Authenticated, waking up...");		mLogger.i("bio wakelock: Authenticated, waking up...");

	mPowerManager.wakeUp(		mPowerManager.wakeUp(
	mSystemClock.uptimeMillis(),		mSystemClock.uptimeMillis(),
	PowerManager.WAKE_REASON_BIOMETRIC,		PowerManager.WAKE_REASON_BIOMETRIC,
	@@ -476,7 +462,10 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
	Trace.endSection();		Trace.endSection();
	};		};

	if (mMode != MODE_NONE && mMode != MODE_WAKE_AND_UNLOCK_FROM_DREAM) {		final boolean wakingFromDream = mMode == MODE_WAKE_AND_UNLOCK_FROM_DREAM
			&& !mStatusBarStateController.isDozing();

			if (mMode != MODE_NONE && !wakingFromDream) {
	wakeUp.run();		wakeUp.run();
	}		}
	switch (mMode) {		switch (mMode) {
	@@ -498,10 +487,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
	Trace.endSection();		Trace.endSection();
	break;		break;
	case MODE_WAKE_AND_UNLOCK_FROM_DREAM:		case MODE_WAKE_AND_UNLOCK_FROM_DREAM:
	// In the case of waking and unlocking from dream, waking up is delayed until after
	// unlock is complete to avoid conflicts during each sequence's transitions.
	mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(wakeUp);
	// Execution falls through here to proceed unlocking.
	case MODE_WAKE_AND_UNLOCK_PULSING:		case MODE_WAKE_AND_UNLOCK_PULSING:
	case MODE_WAKE_AND_UNLOCK:		case MODE_WAKE_AND_UNLOCK:
	if (mMode == MODE_WAKE_AND_UNLOCK_PULSING) {		if (mMode == MODE_WAKE_AND_UNLOCK_PULSING) {

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

+64 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,10 @@ import static org.junit.Assert.assertTrue;
	import static org.mockito.ArgumentMatchers.any;		import static org.mockito.ArgumentMatchers.any;
	import static org.mockito.ArgumentMatchers.anyBoolean;		import static org.mockito.ArgumentMatchers.anyBoolean;
	import static org.mockito.ArgumentMatchers.anyInt;		import static org.mockito.ArgumentMatchers.anyInt;
			import static org.mockito.ArgumentMatchers.anyLong;
			import static org.mockito.ArgumentMatchers.anyString;
	import static org.mockito.Mockito.atLeast;		import static org.mockito.Mockito.atLeast;
			import static org.mockito.Mockito.clearInvocations;
	import static org.mockito.Mockito.eq;		import static org.mockito.Mockito.eq;
	import static org.mockito.Mockito.mock;		import static org.mockito.Mockito.mock;
	import static org.mockito.Mockito.never;		import static org.mockito.Mockito.never;
	@@ -597,6 +600,67 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
	verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(anyBoolean());		verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(anyBoolean());
	}		}

			@Test
			public void testWakeAndUnlockingOverDream() {
			// Send signal to wake
			mViewMediator.onWakeAndUnlocking();

			// Ensure not woken up yet
			verify(mPowerManager, never()).wakeUp(anyLong(), anyInt(), anyString());

			// Verify keyguard told of authentication
			verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(anyBoolean());
			mViewMediator.mViewMediatorCallback.keyguardDonePending(true,
			mUpdateMonitor.getCurrentUser());
			mViewMediator.mViewMediatorCallback.readyForKeyguardDone();
			final ArgumentCaptor<Runnable> animationRunnableCaptor =
			ArgumentCaptor.forClass(Runnable.class);
			verify(mStatusBarKeyguardViewManager).startPreHideAnimation(
			animationRunnableCaptor.capture());

			when(mStatusBarStateController.isDreaming()).thenReturn(true);
			when(mStatusBarStateController.isDozing()).thenReturn(false);
			animationRunnableCaptor.getValue().run();

			when(mKeyguardStateController.isShowing()).thenReturn(false);
			mViewMediator.mViewMediatorCallback.keyguardGone();

			// Verify woken up now.
			verify(mPowerManager).wakeUp(anyLong(), anyInt(), anyString());
			}

			@Test
			public void testWakeAndUnlockingOverDream_signalAuthenticateIfStillShowing() {
			// Send signal to wake
			mViewMediator.onWakeAndUnlocking();

			// Ensure not woken up yet
			verify(mPowerManager, never()).wakeUp(anyLong(), anyInt(), anyString());

			// Verify keyguard told of authentication
			verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(anyBoolean());
			clearInvocations(mStatusBarKeyguardViewManager);
			mViewMediator.mViewMediatorCallback.keyguardDonePending(true,
			mUpdateMonitor.getCurrentUser());
			mViewMediator.mViewMediatorCallback.readyForKeyguardDone();
			final ArgumentCaptor<Runnable> animationRunnableCaptor =
			ArgumentCaptor.forClass(Runnable.class);
			verify(mStatusBarKeyguardViewManager).startPreHideAnimation(
			animationRunnableCaptor.capture());

			when(mStatusBarStateController.isDreaming()).thenReturn(true);
			when(mStatusBarStateController.isDozing()).thenReturn(false);
			animationRunnableCaptor.getValue().run();

			when(mKeyguardStateController.isShowing()).thenReturn(true);

			mViewMediator.mViewMediatorCallback.keyguardGone();


			// Verify keyguard view controller informed of authentication again
			verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(anyBoolean());
			}

	@Test		@Test
	@TestableLooper.RunWithLooper(setAsMainLooper = true)		@TestableLooper.RunWithLooper(setAsMainLooper = true)
	public void testDoKeyguardWhileInteractive_resets() {		public void testDoKeyguardWhileInteractive_resets() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java

+17 −70

Original line number	Original line	Diff line number	Diff line
	@@ -142,8 +142,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
	mNotificationMediaManager, mWakefulnessLifecycle, mScreenLifecycle,		mNotificationMediaManager, mWakefulnessLifecycle, mScreenLifecycle,
	mAuthController, mStatusBarStateController,		mAuthController, mStatusBarStateController,
	mSessionTracker, mLatencyTracker, mScreenOffAnimationController, mVibratorHelper,		mSessionTracker, mLatencyTracker, mScreenOffAnimationController, mVibratorHelper,
	mSystemClock,		mSystemClock
	mStatusBarKeyguardViewManager
	);		);
	mBiometricUnlockController.setKeyguardViewController(mStatusBarKeyguardViewManager);		mBiometricUnlockController.setKeyguardViewController(mStatusBarKeyguardViewManager);
	mBiometricUnlockController.addListener(mBiometricUnlockEventsListener);		mBiometricUnlockController.addListener(mBiometricUnlockEventsListener);
	@@ -464,69 +463,6 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
	verify(mVibratorHelper, never()).vibrateAuthSuccess(anyString());		verify(mVibratorHelper, never()).vibrateAuthSuccess(anyString());
	}		}

	@Test
	public void onSideFingerprintSuccess_dreaming_unlockThenWake() {
	when(mAuthController.isSfpsEnrolled(anyInt())).thenReturn(true);
	when(mWakefulnessLifecycle.getLastWakeReason())
	.thenReturn(PowerManager.WAKE_REASON_POWER_BUTTON);
	final ArgumentCaptor<Runnable> afterKeyguardGoneRunnableCaptor =
	ArgumentCaptor.forClass(Runnable.class);
	givenDreamingLocked();
	mBiometricUnlockController.startWakeAndUnlock(BiometricSourceType.FINGERPRINT, true);

	// Make sure the BiometricUnlockController has registered a callback for when the keyguard
	// is gone
	verify(mStatusBarKeyguardViewManager).addAfterKeyguardGoneRunnable(
	afterKeyguardGoneRunnableCaptor.capture());
	// Ensure that the power hasn't been told to wake up yet.
	verify(mPowerManager, never()).wakeUp(anyLong(), anyInt(), anyString());
	// Check that the keyguard has been told to unlock.
	verify(mKeyguardViewMediator).onWakeAndUnlocking();

	// Simulate the keyguard disappearing.
	afterKeyguardGoneRunnableCaptor.getValue().run();
	// Verify that the power manager has been told to wake up now.
	verify(mPowerManager).wakeUp(anyLong(), anyInt(), anyString());
	}

	@Test
	public void onSideFingerprintSuccess_dreaming_unlockIfStillLockedNotDreaming() {
	when(mAuthController.isSfpsEnrolled(anyInt())).thenReturn(true);
	when(mWakefulnessLifecycle.getLastWakeReason())
	.thenReturn(PowerManager.WAKE_REASON_POWER_BUTTON);
	final ArgumentCaptor<Runnable> afterKeyguardGoneRunnableCaptor =
	ArgumentCaptor.forClass(Runnable.class);
	givenDreamingLocked();
	mBiometricUnlockController.startWakeAndUnlock(BiometricSourceType.FINGERPRINT, true);

	// Make sure the BiometricUnlockController has registered a callback for when the keyguard
	// is gone
	verify(mStatusBarKeyguardViewManager).addAfterKeyguardGoneRunnable(
	afterKeyguardGoneRunnableCaptor.capture());
	// Ensure that the power hasn't been told to wake up yet.
	verify(mPowerManager, never()).wakeUp(anyLong(), anyInt(), anyString());
	// Check that the keyguard has been told to unlock.
	verify(mKeyguardViewMediator).onWakeAndUnlocking();

	when(mUpdateMonitor.isDreaming()).thenReturn(false);
	when(mKeyguardStateController.isUnlocked()).thenReturn(false);

	// Simulate the keyguard disappearing.
	afterKeyguardGoneRunnableCaptor.getValue().run();

	final ArgumentCaptor<Runnable> dismissKeyguardRunnableCaptor =
	ArgumentCaptor.forClass(Runnable.class);
	verify(mHandler).post(dismissKeyguardRunnableCaptor.capture());

	// Verify that the power manager was not told to wake up.
	verify(mPowerManager, never()).wakeUp(anyLong(), anyInt(), anyString());

	dismissKeyguardRunnableCaptor.getValue().run();
	// Verify that the keyguard controller is told to unlock.
	verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(eq(false));
	}


	@Test		@Test
	public void onSideFingerprintSuccess_oldPowerButtonPress_playHaptic() {		public void onSideFingerprintSuccess_oldPowerButtonPress_playHaptic() {
	// GIVEN side fingerprint enrolled, last wake reason was power button		// GIVEN side fingerprint enrolled, last wake reason was power button
	@@ -601,14 +537,25 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
	verify(mStatusBarKeyguardViewManager).showPrimaryBouncer(anyBoolean());		verify(mStatusBarKeyguardViewManager).showPrimaryBouncer(anyBoolean());
	}		}

	private void givenDreamingLocked() {
	when(mUpdateMonitor.isDreaming()).thenReturn(true);
	when(mUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())).thenReturn(true);
	}

	private void givenFingerprintModeUnlockCollapsing() {		private void givenFingerprintModeUnlockCollapsing() {
	when(mUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())).thenReturn(true);		when(mUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())).thenReturn(true);
	when(mUpdateMonitor.isDeviceInteractive()).thenReturn(true);		when(mUpdateMonitor.isDeviceInteractive()).thenReturn(true);
	when(mKeyguardStateController.isShowing()).thenReturn(true);		when(mKeyguardStateController.isShowing()).thenReturn(true);
	}		}

			private void givenDreamingLocked() {
			when(mUpdateMonitor.isDreaming()).thenReturn(true);
			when(mUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())).thenReturn(true);
			}
			@Test
			public void onSideFingerprintSuccess_dreaming_unlockNoWake() {
			when(mAuthController.isSfpsEnrolled(anyInt())).thenReturn(true);
			when(mWakefulnessLifecycle.getLastWakeReason())
			.thenReturn(PowerManager.WAKE_REASON_POWER_BUTTON);
			givenDreamingLocked();
			mBiometricUnlockController.startWakeAndUnlock(BiometricSourceType.FINGERPRINT, true);
			verify(mKeyguardViewMediator).onWakeAndUnlocking();
			// Ensure that the power hasn't been told to wake up yet.
			verify(mPowerManager, never()).wakeUp(anyLong(), anyInt(), anyString());
			}
	}		}