diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-17 15:17:15 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-08-17 18:53:19 -0700 |
| commit | 291905e34a7f0ae03c68fb2c1b8c34b92d447fbf (patch) | |
| tree | 83be3ec7a3702f79d2970771f6e4ac926527c532 /policy/src | |
| parent | 4ae784f126e15ff3363bb8d3587ea60bf642d509 (diff) | |
| download | frameworks_base-291905e34a7f0ae03c68fb2c1b8c34b92d447fbf.zip frameworks_base-291905e34a7f0ae03c68fb2c1b8c34b92d447fbf.tar.gz frameworks_base-291905e34a7f0ae03c68fb2c1b8c34b92d447fbf.tar.bz2 | |
Maybe fix #2925641: calling onCreateOptionsMenu before attached activity
Also add some APIs to PreferenceActivity.
Change-Id: I85894a3eb9cd3e5adb78b82e85454c0d74773178
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 6be5546..f59f32c 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -2459,7 +2459,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { // being called in the middle of onCreate or similar. mDecor.post(new Runnable() { public void run() { - invalidatePanelMenu(FEATURE_ACTION_BAR); + if (!isDestroyed()) { + invalidatePanelMenu(FEATURE_ACTION_BAR); + } } }); } |