Merge "Hide keyguard at notifyBiometricAuthModeChanged to avoid flickering" into main (2f10baf6) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -2256,3 +2256,13 @@ flag {
		description: "Enable plugin for ambient cue project"
		bug: "439907833"
		}

		flag {
		name: "update_keyguard_on_wake_and_unlock_earlier"
		namespace: "systemui"
		description: "Call updateIsKeyguard earlier than on the dozing callback."
		bug: "441261701"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		No newline at end of file

+12 −4

Original line number	Diff line number	Diff line
		@@ -2756,6 +2756,12 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {

		@Override
		public void notifyBiometricAuthModeChanged() {
		if (Flags.updateKeyguardOnWakeAndUnlockEarlier()) {
		if (mBiometricUnlockController.isWakeAndUnlock()) {
		// If we're wake and unlocking we should hide the keyguard ASAP if necessary.
		updateIsKeyguard();
		}
		}
		mDozeServiceHost.updateDozing();
		if (mBiometricUnlockController.getMode()
		== BiometricUnlockController.MODE_DISMISS_BOUNCER) {
		@@ -3152,11 +3158,13 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		mDozeServiceHost.updateDozing();
		updateScrimController();

		if (!Flags.updateKeyguardOnWakeAndUnlockEarlier()) {
		if (mBiometricUnlockController.isWakeAndUnlock()) {
		// Usually doze changes are to/from lockscreen/AOD, but if we're wake and
		// unlocking we should hide the keyguard ASAP if necessary.
		// Usually doze changes are to/from lockscreen/AOD, but if we're wake
		// and unlocking we should hide the keyguard ASAP if necessary.
		updateIsKeyguard();
		}
		}

		updateReportRejectedTouchVisibility();
		Trace.endSection();