Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc

automerge: 61059fe

* commit '61059fe82ca43adcd34ab8f48201a8925dcec164':
  Only hide sensitive content when Keyguard is showing
This commit is contained in:
Jorim Jaggi
2014-11-04 00:05:04 +00:00
committed by android-build-merger

View File

@@ -3630,9 +3630,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
private void updatePublicMode() { private void updatePublicMode() {
setLockscreenPublicMode( setLockscreenPublicMode(mStatusBarKeyguardViewManager.isShowing()
(mStatusBarKeyguardViewManager.isShowing() ||
mStatusBarKeyguardViewManager.isOccluded())
&& mStatusBarKeyguardViewManager.isSecure()); && mStatusBarKeyguardViewManager.isSecure());
} }