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

Merge "Do not let device sleep after successful auth" into qt-r1-dev

Browse Source 
am: 972793ea20

Change-Id: I2683b91687b579e0bc137c829676b40666fac60e
This commit is contained in:
Lucas Dupin
2019-07-16 09:39:53 -07:00
committed by android-build-merger
parent bbb6d4d72b 972793ea20
commit d050a6b90d
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
View File

@@ -237,6 +237,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
MIN_DRAG_SIZE, getResources().getDisplayMetrics()) MIN_DRAG_SIZE, getResources().getDisplayMetrics())
&& !mUpdateMonitor.isFaceDetectionRunning()) { && !mUpdateMonitor.isFaceDetectionRunning()) {
mUpdateMonitor.requestFaceAuth(); mUpdateMonitor.requestFaceAuth();
mCallback.userActivity();
showMessage(null, null); showMessage(null, null);
} }
} }

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

@@ -260,6 +260,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback {
boolean unlockAllowed = mKeyguardBypassController.onBiometricAuthenticated( boolean unlockAllowed = mKeyguardBypassController.onBiometricAuthenticated(
biometricSourceType); biometricSourceType);
if (unlockAllowed) { if (unlockAllowed) {
mKeyguardViewMediator.userActivity();
startWakeAndUnlock(biometricSourceType); startWakeAndUnlock(biometricSourceType);
} else { } else {
Log.d(TAG, "onBiometricAuthenticated aborted by bypass controller"); Log.d(TAG, "onBiometricAuthenticated aborted by bypass controller");