commit 2dc6bda365509f10e098aaf01cc2e9e40de0024d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 15 22:50:03 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 15 22:50:03 2019 +0000
tree 3cbfbc272bd8e5b8400ad0b8b94c0b951c23fc99
parent f688a1b6f62b41f2832e7a65a10c84cd76358e7f
parent d33e9b5c3699dcc896754470cead5ad3bdc9084d

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

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
index f5dab01..9b6ab06 100644
--- 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 void showKeyguard() {
         super.showKeyguard();
         updateNavBarForKeyguardContent();
+        dismissKeyguardWhenUserSwitcherNotDisplayed();
     }
 
     /**