Merge "Keyguard for Auto should only show up in case of a user switcher screen. Else, its safe to dismiss it otherwise." into qt-dev am: 2dc6bda365 am: 5917e5c800

am: 419932540c Change-Id: I0a794b085a8c4be2f13f23d05f7a91ad597568fe
2019-05-16 12:35:56 -07:00
parent 9aba6109f7 419932540c
commit 0ce74605e7
1 changed files with 1 additions and 0 deletions
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
@@ -314,6 +314,7 @@ public class CarStatusBar extends StatusBar implements
    public void showKeyguard() {
        super.showKeyguard();
        updateNavBarForKeyguardContent();
+        dismissKeyguardWhenUserSwitcherNotDisplayed();
    }

    /**