diff options
author | Adam Powell <adamp@google.com> | 2011-07-21 17:33:00 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-21 17:33:00 -0700 |
commit | ff3dbe08171cfdb82eb6916b4fdce703fba6dc96 (patch) | |
tree | e8cd0986f363fa79628eb3d93b8f82ab1ce22106 | |
parent | ec89a2b6063b3826373f5cbb85f0c620042f12e6 (diff) | |
parent | d06caed8d6a53294fe5a0fa2c7e9e394d541ed64 (diff) | |
download | frameworks_base-ff3dbe08171cfdb82eb6916b4fdce703fba6dc96.zip frameworks_base-ff3dbe08171cfdb82eb6916b4fdce703fba6dc96.tar.gz frameworks_base-ff3dbe08171cfdb82eb6916b4fdce703fba6dc96.tar.bz2 |
Merge "Fix bug 5048482 - mischievous monkeys editing text in IME extract mode"
-rw-r--r-- | core/java/android/inputmethodservice/ExtractEditLayout.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/inputmethodservice/ExtractEditLayout.java b/core/java/android/inputmethodservice/ExtractEditLayout.java index eafff49..5cfa998 100644 --- 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 |