From ec705c2c58c6dedab65cb59c7a6221eba8ff22ef Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Mon, 3 Nov 2014 22:08:05 +0100 Subject: [PATCH] Only hide sensitive content when Keyguard is showing isOccluded is set delayed when unlocking the phone from a notification, so updatePublicMode used a stale state. Now, only the fact whether the Keyguard is showing (no matter if occluded or not) is used to determine the public mode, which is set in a synchronous manner. Bug: 18026898 Change-Id: I3e4988f3e806cf15616ee5aa452f81f19d4aa716 --- .../com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index fc7081b1598ff..72dfee642467a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -3630,9 +3630,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } private void updatePublicMode() { - setLockscreenPublicMode( - (mStatusBarKeyguardViewManager.isShowing() || - mStatusBarKeyguardViewManager.isOccluded()) + setLockscreenPublicMode(mStatusBarKeyguardViewManager.isShowing() && mStatusBarKeyguardViewManager.isSecure()); }