Merge "Refactor BiometricUnlockController mode/state control" into tm-dev (e7bf883f) · Commits · e / os / android_frameworks_base

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

+28 −28

Original line number	Diff line number	Diff line
		@@ -537,27 +537,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
		mPendingShowBouncer = false;
		}

		@Override
		public void onStartedGoingToSleep(int why) {
		resetMode();
		mFadedAwayAfterWakeAndUnlock = false;
		mPendingAuthenticated = null;
		}

		@Override
		public void onFinishedGoingToSleep(int why) {
		Trace.beginSection("BiometricUnlockController#onFinishedGoingToSleep");
		if (mPendingAuthenticated != null) {
		PendingAuthenticated pendingAuthenticated = mPendingAuthenticated;
		// Post this to make sure it's executed after the device is fully locked.
		mHandler.post(() -> onBiometricAuthenticated(pendingAuthenticated.userId,
		pendingAuthenticated.biometricSourceType,
		pendingAuthenticated.isStrongBiometric));
		mPendingAuthenticated = null;
		}
		Trace.endSection();
		}

		public boolean hasPendingAuthentication() {
		return mPendingAuthenticated != null
		&& mUpdateMonitor
		@@ -758,6 +737,27 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
		BiometricUnlockController.this.showBouncer();
		}
		}

		@Override
		public void onStartedGoingToSleep() {
		resetMode();
		mFadedAwayAfterWakeAndUnlock = false;
		mPendingAuthenticated = null;
		}

		@Override
		public void onFinishedGoingToSleep() {
		Trace.beginSection("BiometricUnlockController#onFinishedGoingToSleep");
		if (mPendingAuthenticated != null) {
		PendingAuthenticated pendingAuthenticated = mPendingAuthenticated;
		// Post this to make sure it's executed after the device is fully locked.
		mHandler.post(() -> onBiometricAuthenticated(pendingAuthenticated.userId,
		pendingAuthenticated.biometricSourceType,
		pendingAuthenticated.isStrongBiometric));
		mPendingAuthenticated = null;
		}
		Trace.endSection();
		}
		};

		private final ScreenLifecycle.Observer mScreenObserver =

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -408,7 +408,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
		@Test
		public void onFinishedGoingToSleep_authenticatesWhenPending() {
		when(mUpdateMonitor.isGoingToSleep()).thenReturn(true);
		mBiometricUnlockController.onFinishedGoingToSleep(-1);
		mBiometricUnlockController.mWakefulnessObserver.onFinishedGoingToSleep();
		verify(mHandler, never()).post(any());

		ArgumentCaptor<Runnable> captor = ArgumentCaptor.forClass(Runnable.class);
		@@ -416,7 +416,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
		// value of isUnlockingWithBiometricAllowed()
		mBiometricUnlockController.onBiometricAuthenticated(1 /* userId */,
		BiometricSourceType.FACE, true /* isStrongBiometric */);
		mBiometricUnlockController.onFinishedGoingToSleep(-1);
		mBiometricUnlockController.mWakefulnessObserver.onFinishedGoingToSleep();
		verify(mHandler).post(captor.capture());
		captor.getValue().run();
		}