diff options
| -rw-r--r-- | core/java/com/android/internal/view/menu/MenuPopupHelper.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java index 1d103ed660f1..1406e4e1d5c9 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 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On if (isShowing()) { mPopup.dismiss(); } - mTreeObserver.removeGlobalOnLayoutListener(this); - mTreeObserver = null; + if (mTreeObserver != null) { + mTreeObserver.removeGlobalOnLayoutListener(this); + mTreeObserver = null; + } } public boolean isShowing() { |