diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-10-09 21:18:58 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2011-10-12 16:53:48 -0400 |
| commit | ec3f05e707044505642cbdb180aff5edf9b926aa (patch) | |
| tree | 9b91dc5985d0a7b3d0087cd8db554cb5bf213079 /policy/src | |
| parent | fd8f6f2f7557c414466f7634391821e59c1ce040 (diff) | |
| download | frameworks_base-ec3f05e707044505642cbdb180aff5edf9b926aa.zip frameworks_base-ec3f05e707044505642cbdb180aff5edf9b926aa.tar.gz frameworks_base-ec3f05e707044505642cbdb180aff5edf9b926aa.tar.bz2 | |
Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)
Leaky singleton bug! GlobalActions, recents, and the
keyguard are all in the same process and therefore receive
the same StatusBarManager instance. Therefore, their calls
to enable() and disable() clobber one another.
Bug: 5423182
Change-Id: Ie535d88f5a5bb940dabee5f1ac176027e1793c5c
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/GlobalActions.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index 8569143..11b6c15 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -18,7 +18,6 @@ package com.android.internal.policy.impl; import android.app.Activity; import android.app.AlertDialog; -import android.app.StatusBarManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -57,8 +56,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac private static final String TAG = "GlobalActions"; - private StatusBarManager mStatusBar; - private final Context mContext; private final AudioManager mAudioManager; @@ -103,13 +100,12 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac mKeyguardShowing = keyguardShowing; mDeviceProvisioned = isDeviceProvisioned; if (mDialog == null) { - mStatusBar = (StatusBarManager)mContext.getSystemService(Context.STATUS_BAR_SERVICE); mDialog = createDialog(); } prepareDialog(); - mStatusBar.disable(StatusBarManager.DISABLE_EXPAND); mDialog.show(); + mDialog.getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_DISABLE_EXPAND); } /** @@ -249,7 +245,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac /** {@inheritDoc} */ public void onDismiss(DialogInterface dialog) { - mStatusBar.disable(StatusBarManager.DISABLE_NONE); } /** {@inheritDoc} */ |