diff options
| author | 2014-01-16 16:31:33 +0000 | |
|---|---|---|
| committer | 2014-01-16 16:31:33 +0000 | |
| commit | 3d4c3aca868231fe503cd7254f89f1c46a9f8f66 (patch) | |
| tree | aa955d386db6ae7d2d1a5c2dd4ca8b756bffb2ec | |
| parent | 0574dc53b20e6bd254725b4209814822c39644d6 (diff) | |
| parent | d849f546db7a95d4fa0c4c2ed2323c5e64ff7ead (diff) | |
Merge "check for null mEditor in TextView.canCopy()"
| -rw-r--r-- | core/java/android/widget/TextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 5d42589ff044..aa8bbb276882 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8481,7 +8481,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return false; } - if (mText.length() > 0 && hasSelection()) { + if (mText.length() > 0 && hasSelection() && mEditor != null) { return true; } |