summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Priyank Singh <priyanksingh@google.com> 2019-05-16 12:35:56 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-16 12:35:56 -0700
commit0ce74605e72b511f30a7d0ce4f2502f0f47b956b (patch)
treef7cf1c0e713b8aa06eca51c3f8299b169dd105f1
parent9aba6109f77454182eee8cec43729551ade7467a (diff)
parent419932540c996cff63ca9fb31a9c2bcc1b9cc469 (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 am: 5917e5c800
am: 419932540c Change-Id: I0a794b085a8c4be2f13f23d05f7a91ad597568fe
-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();
}
/**