Merge "Use Lazy BioUnlockController in DozeServiceHost." into rvc-dev am: 6335c26984 (ebb74ee9) · Commits · e / os / android_frameworks_base

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

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -77,7 +77,6 @@ public final class DozeServiceHost implements DozeHost {
	private final BatteryController mBatteryController;		private final BatteryController mBatteryController;
	private final ScrimController mScrimController;		private final ScrimController mScrimController;
	private final Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy;		private final Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy;
	private BiometricUnlockController mBiometricUnlockController;
	private final KeyguardViewMediator mKeyguardViewMediator;		private final KeyguardViewMediator mKeyguardViewMediator;
	private final Lazy<AssistManager> mAssistManagerLazy;		private final Lazy<AssistManager> mAssistManagerLazy;
	private final DozeScrimController mDozeScrimController;		private final DozeScrimController mDozeScrimController;
	@@ -148,9 +147,9 @@ public final class DozeServiceHost implements DozeHost {
	mNotificationPanel = notificationPanel;		mNotificationPanel = notificationPanel;
	mNotificationShadeWindowViewController = notificationShadeWindowViewController;		mNotificationShadeWindowViewController = notificationShadeWindowViewController;
	mAmbientIndicationContainer = ambientIndicationContainer;		mAmbientIndicationContainer = ambientIndicationContainer;
	mBiometricUnlockController = mBiometricUnlockControllerLazy.get();
	}		}


	@Override		@Override
	public String toString() {		public String toString() {
	return "PSB.DozeServiceHost[mCallbacks=" + mCallbacks.size() + "]";		return "PSB.DozeServiceHost[mCallbacks=" + mCallbacks.size() + "]";
	@@ -206,11 +205,11 @@ public final class DozeServiceHost implements DozeHost {
	boolean		boolean
	dozing =		dozing =
	mDozingRequested && mStatusBarStateController.getState() == StatusBarState.KEYGUARD		mDozingRequested && mStatusBarStateController.getState() == StatusBarState.KEYGUARD
	\|\| mBiometricUnlockController.getMode()		\|\| mBiometricUnlockControllerLazy.get().getMode()
	== BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING;		== BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING;
	// When in wake-and-unlock we may not have received a change to StatusBarState		// 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.		// but we still should not be dozing, manually set to false.
	if (mBiometricUnlockController.getMode()		if (mBiometricUnlockControllerLazy.get().getMode()
	== BiometricUnlockController.MODE_WAKE_AND_UNLOCK) {		== BiometricUnlockController.MODE_WAKE_AND_UNLOCK) {
	dozing = false;		dozing = false;
	}		}
	@@ -311,7 +310,7 @@ public final class DozeServiceHost implements DozeHost {

	@Override		@Override
	public boolean isPulsingBlocked() {		public boolean isPulsingBlocked() {
	return mBiometricUnlockController.getMode()		return mBiometricUnlockControllerLazy.get().getMode()
	== BiometricUnlockController.MODE_WAKE_AND_UNLOCK;		== BiometricUnlockController.MODE_WAKE_AND_UNLOCK;
	}		}

	@@ -323,7 +322,7 @@ public final class DozeServiceHost implements DozeHost {

	@Override		@Override
	public boolean isBlockingDoze() {		public boolean isBlockingDoze() {
	if (mBiometricUnlockController.hasPendingAuthentication()) {		if (mBiometricUnlockControllerLazy.get().hasPendingAuthentication()) {
	Log.i(StatusBar.TAG, "Blocking AOD because fingerprint has authenticated");		Log.i(StatusBar.TAG, "Blocking AOD because fingerprint has authenticated");
	return true;		return true;
	}		}