Merge "Calling hideKeyguard more often, instead of caching it" into oc-dr1-dev

am: 71e0a3758f Change-Id: I2841b973d012ea3d0b2c4162f3930e3d48cebad1
2017-07-05 17:44:52 +00:00
parent 712bf2d40e 71e0a3758f
commit 9208057da2
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -4206,7 +4206,7 @@ public class StatusBar extends SystemUI implements DemoMode,
        }
        if (shouldBeKeyguard) {
            showKeyguardImpl();
-        } else if (!shouldBeKeyguard && mIsKeyguard) {
+        } else {
            return hideKeyguardImpl();
        }
        return false;