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

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

Merge "Enable auth on AOD2" into qt-r1-dev 

am: 65eaa0df

Change-Id: I0c3d2b2a792fb752caa76f8aaec79e5a51529664
parents 418ab741 65eaa0df

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

+3 −2
Original line number Diff line number Diff line
@@ -3886,8 +3886,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
        private boolean mAnimateWakeup;

        private boolean mAnimateScreenOff;

        private boolean mIgnoreTouchWhilePulsing;

        private boolean mWakeLockScreenPerformsAuth = SystemProperties.getBoolean(

                "persist.sysui.wake_performs_auth", false);

        @VisibleForTesting

        boolean mWakeLockScreenPerformsAuth = SystemProperties.getBoolean(

                "persist.sysui.wake_performs_auth", true);



        @Override

        public String toString() {

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

+1 −0
Original line number Diff line number Diff line
@@ -824,6 +824,7 @@ public class StatusBarTest extends SysuiTestCase { 
            mAutoHideController = autoHideController;

            mKeyguardUpdateMonitor = keyguardUpdateMonitor;

            mStatusBarWindow = statusBarWindow;

            mDozeServiceHost.mWakeLockScreenPerformsAuth = false;

        }



        private WakefulnessLifecycle createAwakeWakefulnessLifecycle() {