diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-12-16 18:17:23 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-12-17 11:04:14 -0500 |
| commit | 8a4fd2f8e7f78538adad82f4c95e8746f880abcc (patch) | |
| tree | 05b18c27ac6b5936ee27c853d4ac7410d896819f /core/java/android/webkit/SelectActionModeCallback.java | |
| parent | b67529b905440e2ba550742773b927abad882c19 (diff) | |
| download | frameworks_base-8a4fd2f8e7f78538adad82f4c95e8746f880abcc.zip frameworks_base-8a4fd2f8e7f78538adad82f4c95e8746f880abcc.tar.gz frameworks_base-8a4fd2f8e7f78538adad82f4c95e8746f880abcc.tar.bz2 | |
Do not allow text selection if there is no ActionBar.
Bug:3276538
Change-Id: I060f14471e26e4bc1bf9773b847e0dbac9228426
Diffstat (limited to 'core/java/android/webkit/SelectActionModeCallback.java')
| -rw-r--r-- | core/java/android/webkit/SelectActionModeCallback.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/SelectActionModeCallback.java b/core/java/android/webkit/SelectActionModeCallback.java index 54c9d9a..86a67c7 100644 --- a/core/java/android/webkit/SelectActionModeCallback.java +++ b/core/java/android/webkit/SelectActionModeCallback.java @@ -34,7 +34,11 @@ class SelectActionModeCallback implements ActionMode.Callback { } void finish() { - mActionMode.finish(); + // It is possible that onCreateActionMode was never called, in the case + // where there is no ActionBar, for example. + if (mActionMode != null) { + mActionMode.finish(); + } } // ActionMode.Callback implementation |