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

Merge "Use Lazy BioUnlockController in DozeServiceHost." into rvc-dev am: 6335c26984

Browse Source 
Change-Id: Ife175886c69a1bc49bf57f13b5e00fa7ea59b7be
This commit is contained in:
TreeHugger Robot
2020-04-24 17:08:27 +00:00
committed by Automerger Merge Worker
parent 79f5400823 6335c26984
commit 50752b05d6
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java
View File

@@ -77,7 +77,6 @@ public final class DozeServiceHost implements DozeHost {
private final BatteryController mBatteryController;
private final ScrimController mScrimController;
private final Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy;
private BiometricUnlockController mBiometricUnlockController;
private final KeyguardViewMediator mKeyguardViewMediator;
private final Lazy<AssistManager> mAssistManagerLazy;
private final DozeScrimController mDozeScrimController;
@@ -148,9 +147,9 @@ public final class DozeServiceHost implements DozeHost {
mNotificationPanel = notificationPanel;
mNotificationShadeWindowViewController = notificationShadeWindowViewController;
mAmbientIndicationContainer = ambientIndicationContainer;
mBiometricUnlockController = mBiometricUnlockControllerLazy.get();
}
@Override
public String toString() {
return "PSB.DozeServiceHost[mCallbacks=" + mCallbacks.size() + "]";
@@ -206,11 +205,11 @@ public final class DozeServiceHost implements DozeHost {
boolean
dozing =
mDozingRequested && mStatusBarStateController.getState() == StatusBarState.KEYGUARD
|| mBiometricUnlockController.getMode()
|| mBiometricUnlockControllerLazy.get().getMode()
== BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING;
// When in wake-and-unlock we may not have received a change to StatusBarState
// but we still should not be dozing, manually set to false.
if (mBiometricUnlockController.getMode()
if (mBiometricUnlockControllerLazy.get().getMode()
== BiometricUnlockController.MODE_WAKE_AND_UNLOCK) {
dozing = false;
}
@@ -311,7 +310,7 @@ public final class DozeServiceHost implements DozeHost {
@Override
public boolean isPulsingBlocked() {
return mBiometricUnlockController.getMode()
return mBiometricUnlockControllerLazy.get().getMode()
== BiometricUnlockController.MODE_WAKE_AND_UNLOCK;
}
@@ -323,7 +322,7 @@ public final class DozeServiceHost implements DozeHost {
@Override
public boolean isBlockingDoze() {
if (mBiometricUnlockController.hasPendingAuthentication()) {
if (mBiometricUnlockControllerLazy.get().hasPendingAuthentication()) {
Log.i(StatusBar.TAG, "Blocking AOD because fingerprint has authenticated");
return true;
}