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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-11 04:48:28 +00:00
committed by Android (Google) Code Review
parent bb4c4a885f 8b8c2bd0d2
commit 65eaa0df65
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3886,8 +3886,9 @@ public class StatusBar extends SystemUI implements DemoMode,
private boolean mAnimateWakeup; private boolean mAnimateWakeup;
private boolean mAnimateScreenOff; private boolean mAnimateScreenOff;
private boolean mIgnoreTouchWhilePulsing; private boolean mIgnoreTouchWhilePulsing;
private boolean mWakeLockScreenPerformsAuth = SystemProperties.getBoolean( @VisibleForTesting
"persist.sysui.wake_performs_auth", false); boolean mWakeLockScreenPerformsAuth = SystemProperties.getBoolean(
"persist.sysui.wake_performs_auth", true);
@Override @Override
public String toString() { public String toString() {

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

@@ -824,6 +824,7 @@ public class StatusBarTest extends SysuiTestCase {
mAutoHideController = autoHideController; mAutoHideController = autoHideController;
mKeyguardUpdateMonitor = keyguardUpdateMonitor; mKeyguardUpdateMonitor = keyguardUpdateMonitor;
mStatusBarWindow = statusBarWindow; mStatusBarWindow = statusBarWindow;
mDozeServiceHost.mWakeLockScreenPerformsAuth = false;
} }
private WakefulnessLifecycle createAwakeWakefulnessLifecycle() { private WakefulnessLifecycle createAwakeWakefulnessLifecycle() {