diff options
author | 2014-11-03 22:38:32 +0000 | |
---|---|---|
committer | 2014-11-03 22:38:34 +0000 | |
commit | 3c7efdc00506e6561ca08933f0b2acf5e3f16b02 (patch) | |
tree | dd6976452165c4bdc20014edc56c32a41dc14c56 | |
parent | c85ccdf307fcc8c826ac6d02f372f724b8984089 (diff) | |
parent | ec705c2c58c6dedab65cb59c7a6221eba8ff22ef (diff) |
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 |
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()); } |