Merge "Adb command to authenticate earlier" into qt-r1-dev

This commit is contained in:
Lucas Dupin
2019-05-24 16:50:42 +00:00
committed by Android (Google) Code Review

View File

@@ -3890,6 +3890,8 @@ 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);
@Override
public String toString() {
@@ -3945,7 +3947,9 @@ public class StatusBar extends SystemUI implements DemoMode,
mStatusBarWindow.suppressWakeUpGesture(true);
}
boolean passiveAuthInterrupt = reason == DozeLog.PULSE_REASON_NOTIFICATION;
boolean passiveAuthInterrupt = reason == DozeLog.PULSE_REASON_NOTIFICATION || (
reason == DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN
&& mWakeLockScreenPerformsAuth);
// Set the state to pulsing, so ScrimController will know what to do once we ask it to
// execute the transition. The pulse callback will then be invoked when the scrims
// are black, indicating that StatusBar is ready to present the rest of the UI.