From 5750c685d7132e2a84b796dd68628c533e1788ea Mon Sep 17 00:00:00 2001 From: Heemin Seog Date: Thu, 14 May 2020 22:11:00 -0700 Subject: [PATCH] On reset, show keyguard if not already shown This is to address an inconsistent state when the keyguard service thinks the keyguard should be visible but the keyguard view does not. Bug: 155706342 Bug: 156440963 Test: manual, atest ActivityLifecycleKeyguardTests Change-Id: I566802e5d71a4ce387c9f31951ffa33be664c7b2 --- .../systemui/car/keyguard/CarKeyguardViewController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java b/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java index aee7643b69f7f..a701e9f280fdc 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java @@ -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); } }