Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5750c685 authored by Heemin Seog's avatar Heemin Seog
Browse files

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
parent 21ebdf80

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);

        }

    }