Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d050a6b9 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

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

am: 972793ea

Change-Id: I2683b91687b579e0bc137c829676b40666fac60e
parents bbb6d4d7 972793ea

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

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
                    MIN_DRAG_SIZE, getResources().getDisplayMetrics())

                    && !mUpdateMonitor.isFaceDetectionRunning()) {

                mUpdateMonitor.requestFaceAuth();

                mCallback.userActivity();

                showMessage(null, null);

            }

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 
        boolean unlockAllowed = mKeyguardBypassController.onBiometricAuthenticated(

                biometricSourceType);

        if (unlockAllowed) {

            mKeyguardViewMediator.userActivity();

            startWakeAndUnlock(biometricSourceType);

        } else {

            Log.d(TAG, "onBiometricAuthenticated aborted by bypass controller");