commit 850a4c66881d96cbf98619c81686f4d496370909
author Adam Powell <adamp@google.com> Tue Nov 16 10:27:54 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 16 10:27:54 2010 -0800
tree 865c56da552a191a4a91dc65e8f6df68f8cc6c7b
parent 75663ceec407dbab5740460b6e7ae7ae9403e5a0
parent ed8b403cc8066bf76cdf98f8d9906ff810defc5b

Merge "Fix bug 3198503 - NPE at MenuPopupHelper.dismiss"

core/java/com/android/internal/view/menu/MenuPopupHelper.java

diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java
index 1d103ed..1406e4e 100644
--- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java
+++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java
@@ -110,8 +110,10 @@
         if (isShowing()) {
             mPopup.dismiss();
         }
-        mTreeObserver.removeGlobalOnLayoutListener(this);
-        mTreeObserver = null;
+        if (mTreeObserver != null) {
+            mTreeObserver.removeGlobalOnLayoutListener(this);
+            mTreeObserver = null;
+        }
     }
 
     public boolean isShowing() {