diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-08-18 09:41:01 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@google.com> | 2011-08-18 09:41:01 -0400 |
| commit | 130453c2eb615bb8cc51a26afbd40822a72636c1 (patch) | |
| tree | ce14d2ea1ed50d11e39ddce35be34b4886ed71ea /policy/src/com/android/internal | |
| parent | 7fa6e4248383ea9d894cc2ac8037cbb04cb13197 (diff) | |
| download | frameworks_base-130453c2eb615bb8cc51a26afbd40822a72636c1.zip frameworks_base-130453c2eb615bb8cc51a26afbd40822a72636c1.tar.gz frameworks_base-130453c2eb615bb8cc51a26afbd40822a72636c1.tar.bz2 | |
Fix DISABLE_EXPAND in the tablet status bar.
The codepath that honored this flag had been routed around
when notification peeks were disabled. (The bug was allowing
notifications to be accessed from a secure lockscreen.)
Bug: 5173959
Change-Id: I35dee343ee4f0288530580054f8bb9f511ebe6af
Diffstat (limited to 'policy/src/com/android/internal')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index 06b7fb9..86de558 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -1142,6 +1142,10 @@ public class KeyguardViewMediator implements KeyguardViewCallback, // insecure and (is covered by another window OR this feature is enabled in general) boolean enable = !mShowing || ((ENABLE_STATUS_BAR_IN_KEYGUARD || mHidden) && !isSecure()); + if (DEBUG) { + Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mHidden=" + mHidden + + " isSecure=" + isSecure() + " --> enable=" + enable); + } mStatusBarManager.disable(enable ? StatusBarManager.DISABLE_NONE : ( StatusBarManager.DISABLE_EXPAND |