Merge "Reshow keyguard if keyguard going away anim is cancelled" into main (66c68099) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.classifier.FalsingCollector;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor;
		import com.android.systemui.dreams.DreamOverlayStateController;
		import com.android.systemui.dreams.ui.viewmodel.DreamViewModel;
		import com.android.systemui.dump.DumpManager;
		@@ -3404,7 +3405,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,

		// Ensure that keyguard becomes visible if the going away animation is canceled
		if (showKeyguard && !KeyguardWmStateRefactor.isEnabled()
		&& MigrateClocksToBlueprint.isEnabled()) {
		&& (MigrateClocksToBlueprint.isEnabled()
		\|\| DeviceEntryUdfpsRefactor.isEnabled())) {
		mKeyguardInteractor.showKeyguard();
		}
		}