Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop face auth if occluding app doesn't want face auth." into tm-qpr-dev am: e43723b83d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20508267

Change-Id: If9b41add02c3e8b791827ad37df4a8ba0bba9955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-12-01 11:56:48 +00:00
committed by Automerger Merge Worker
parent e467fe5b1d e43723b83d
commit 423bdcf9a3
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

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

18
packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
View File

@@ -1284,6 +1284,24 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isEqualTo(true); 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 @Test
public void testRequireUnlockForNfc_Broadcast() { public void testRequireUnlockForNfc_Broadcast() {
KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class); KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class);