From c3d4c74c17eb403fbe766d5a796c0003af7a4e46 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Mon, 3 Jul 2017 14:44:17 +0200
Subject: [PATCH] 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
---
 .../src/com/android/systemui/statusbar/phone/StatusBar.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 14d0b7ea86b94..5e4091a91a20a 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;