summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-01-07 17:16:56 -0800
committerAdam Powell <adamp@google.com>2011-01-07 17:22:25 -0800
commit5e3f284baa271cb0fbf90e504d19fdd2e385382e (patch)
treef852a25e655b99203897a217a9d58b7adab0f9f4 /policy
parent7866b8a64000f8e25cf1c50cc5a74d3aa138c796 (diff)
downloadframeworks_base-5e3f284baa271cb0fbf90e504d19fdd2e385382e.zip
frameworks_base-5e3f284baa271cb0fbf90e504d19fdd2e385382e.tar.gz
frameworks_base-5e3f284baa271cb0fbf90e504d19fdd2e385382e.tar.bz2
Fix bug 3200615 - "MenuPopupHelper cannot be used without an anchor"
Add protection against views disappearing before previously posted Runnables attempt to show a menu anchored to them. Change-Id: Ia2a322e76665e61feb5bdb92377d5066cb6d5b04
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 3b2aeaf..5098a98 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -3007,10 +3007,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
@Override
public void run() {
- show();
- Callback cb = getCallback();
- if (cb != null) {
- cb.onMenuOpened(FEATURE_ACTION_BAR, mSubMenu);
+ if (tryShow()) {
+ Callback cb = getCallback();
+ if (cb != null) {
+ cb.onMenuOpened(FEATURE_ACTION_BAR, mSubMenu);
+ }
}
}
}