Merge "Fix bug 5048482 - mischievous monkeys editing text in IME extract mode"

2011-07-21 17:33:00 -07:00
parent ec89a2b606 d06caed8d6
commit ff3dbe0817
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/inputmethodservice/ExtractEditLayout.java
+++ b/core/java/android/inputmethodservice/ExtractEditLayout.java
@@ -172,7 +172,10 @@ public class ExtractEditLayout extends LinearLayout {

        @Override
        public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
-            return mCallback.onActionItemClicked(this, item);
+            if (mCallback != null) {
+                return mCallback.onActionItemClicked(this, item);
+            }
+            return false;
        }

        @Override