summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2014-11-03 22:08:05 +0100
committer Jorim Jaggi <jjaggi@google.com> 2014-11-03 22:08:05 +0100
commitec705c2c58c6dedab65cb59c7a6221eba8ff22ef (patch)
treea066fa508556b61a61d1c2c5235d1311a0f79397
parent946863b63c05eb3ea38f422d5a198e95b0cc2aaa (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java4
1 files changed, 1 insertions, 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 fc7081b1598f..72dfee642467 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());
}