diff options
| author | Adam Powell <adamp@google.com> | 2011-07-27 15:47:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-27 15:47:04 -0700 |
| commit | 257466d4e24bd405204cb21a1663eb1cc99f6137 (patch) | |
| tree | 2d1a75c31fac5c81c6a6b0002efb12bf5ee3301d /core/java/android/app/Fragment.java | |
| parent | 24f2936d352e8938a02ec10ace57cac8671fc68f (diff) | |
| parent | 89b09da7b3b1e69264d9ec710c66eb2f891b313e (diff) | |
Merge "Bug 5076788 - Optimize the building and invalidation of menus"
Diffstat (limited to 'core/java/android/app/Fragment.java')
| -rw-r--r-- | core/java/android/app/Fragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 2035c73fb211..e2746d4517df 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -883,7 +883,7 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener public void setHasOptionsMenu(boolean hasMenu) { if (mHasMenu != hasMenu) { mHasMenu = hasMenu; - if (isAdded() && !isHidden()) { + if (isAdded() && !isHidden() && isResumed()) { mActivity.invalidateOptionsMenu(); } } |