summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Priyank Singh <priyanksingh@google.com> 2019-05-15 23:02:22 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-15 23:02:22 -0700
commit5917e5c800156969fe2a7da93bc459828b227d6c (patch)
tree58bd6cd000c394c091e5e22155ce0b742b5054d2
parentbee9cdee3ec5bf7c8e09748dd7256c1c79c8e7e5 (diff)
parent2dc6bda365509f10e098aaf01cc2e9e40de0024d (diff)
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 Change-Id: I9f4e5c1ea0b3de0b4cd03f9aac691715502bca7b
-rw-r--r--packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java1
1 files changed, 1 insertions, 0 deletions
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 f5dab01d1b09..9b6ab06c4708 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 class CarStatusBar extends StatusBar implements
public void showKeyguard() {
super.showKeyguard();
updateNavBarForKeyguardContent();
+ dismissKeyguardWhenUserSwitcherNotDisplayed();
}
/**