Merge "On reset, show keyguard if not already shown" into rvc-dev am: c8cd1ad532

Change-Id: Ibb316f5a4a9cb2f8e734b005ee1bf8e8e56cdf12
This commit is contained in:
Heemin Seog
2020-05-15 20:50:32 +00:00
committed by Automerger Merge Worker

View File

@@ -203,6 +203,11 @@ public class CarKeyguardViewController extends OverlayViewController implements
} }
mKeyguardUpdateMonitor.sendKeyguardReset(); mKeyguardUpdateMonitor.sendKeyguardReset();
notifyKeyguardUpdateMonitor(); 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);
} }
} }