summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-04-21 14:51:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-21 14:51:24 -0700
commit712079a63f92ed8f0b569fcfab0886a87423a09a (patch)
tree44ad755867c40ea754a434201b68c376ee45ee5a
parentbf96c356c02c430153c281fb81dc1a00f7ad0b43 (diff)
parenta86b350977be53146d568bc0736d0f2b4aef8de5 (diff)
downloadframeworks_base-712079a63f92ed8f0b569fcfab0886a87423a09a.zip
frameworks_base-712079a63f92ed8f0b569fcfab0886a87423a09a.tar.gz
frameworks_base-712079a63f92ed8f0b569fcfab0886a87423a09a.tar.bz2
Merge "Fix bug 4329016 - Refresh menus properly while in batch update mode"
-rw-r--r--core/java/com/android/internal/view/menu/MenuBuilder.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java
index b348142..7fba5ca 100644
--- a/core/java/com/android/internal/view/menu/MenuBuilder.java
+++ b/core/java/com/android/internal/view/menu/MenuBuilder.java
@@ -814,8 +814,10 @@ public class MenuBuilder implements Menu {
* many menu operations are going to be performed as a batch.
*/
public void stopDispatchingItemsChanged() {
- mPreventDispatchingItemsChanged = true;
- mItemsChangedWhileDispatchPrevented = false;
+ if (!mPreventDispatchingItemsChanged) {
+ mPreventDispatchingItemsChanged = true;
+ mItemsChangedWhileDispatchPrevented = false;
+ }
}
public void startDispatchingItemsChanged() {