summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2017-07-03 14:44:17 +0200
committer Selim Cinek <cinek@google.com> 2017-07-04 10:22:34 +0200
commitc3d4c74c17eb403fbe766d5a796c0003af7a4e46 (patch)
treeb4da98e8556eeab59cf1f1e8624afd51f6ea129e
parentd43bc31eb73ed062af502f77da38a64983ed90cf (diff)
Calling hideKeyguard more often, instead of caching it
Because we were caching the Keyguard state, we didn't call hideKeyguard anymore when going to the shade locked and then unlocking. As a consequence did we never update the public mode and therefore remained in a wrong state. Lot's of bad things could happen with it, for example did inline reply not work anymore and the clear all button would be hidden in certain cases. In general would the user not be properly unlocked. Test: manual, go to locked shade with redaction turned on, unlock via affordance, observe notifications are unlocked Fixes: 62721741 Fixes: 62378400 Change-Id: Ibc757859ef26a1dba887e8986d6a2f8f2fe2efb4
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 14d0b7ea86b9..5e4091a91a20 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -4196,7 +4196,7 @@ public class StatusBar extends SystemUI implements DemoMode,
}
if (shouldBeKeyguard) {
showKeyguardImpl();
- } else if (!shouldBeKeyguard && mIsKeyguard) {
+ } else {
return hideKeyguardImpl();
}
return false;