Merge "Stop face auth if occluding app doesn't want face auth." into tm-qpr-dev (e43723b8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -751,8 +751,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		*/
		public void requestFaceAuthOnOccludingApp(boolean request) {
		mOccludingAppRequestingFace = request;
		updateFaceListeningState(BIOMETRIC_ACTION_UPDATE,
		FACE_AUTH_TRIGGERED_OCCLUDING_APP_REQUESTED);
		int action = mOccludingAppRequestingFace ? BIOMETRIC_ACTION_UPDATE : BIOMETRIC_ACTION_STOP;
		updateFaceListeningState(action, FACE_AUTH_TRIGGERED_OCCLUDING_APP_REQUESTED);
		}

		/**

+18 −0

Original line number	Diff line number	Diff line
		@@ -1284,6 +1284,24 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isEqualTo(true);
		}

		@Test
		public void testRequestFaceAuthFromOccludingApp_whenInvoked_startsFaceAuth() {
		mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(true);

		assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isTrue();
		}

		@Test
		public void testRequestFaceAuthFromOccludingApp_whenInvoked_stopsFaceAuth() {
		mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(true);

		assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isTrue();

		mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false);

		assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isFalse();
		}

		@Test
		public void testRequireUnlockForNfc_Broadcast() {
		KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class);