Merge "On reset, show keyguard if not already shown" into rvc-dev (c8cd1ad5) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -203,6 +203,11 @@ public class CarKeyguardViewController extends OverlayViewController implements
		}
		mKeyguardUpdateMonitor.sendKeyguardReset();
		notifyKeyguardUpdateMonitor();
		} else {
		// This is necessary in order to address an inconsistency between the keyguard service
		// and the keyguard views.
		// TODO: Investigate the source of the inconsistency.
		show(/* options= */ null);
		}
		}