summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-01-03 03:37:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-01-03 03:37:55 +0000
commit6ea80ae06cc74bfc329a7d1f0122b3458f296131 (patch)
treed620a90bb22e337e8a6849f85bc5da5a9403a16d
parentc36fbd4f0f01d6c279cdbe34b5596a81e0f53eb1 (diff)
parentc832bd57f7d5c8accf4aff0c6c6b3bbde88b9f1a (diff)
Merge "Fix crash in EditText#getText"
-rw-r--r--core/java/android/widget/EditText.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/widget/EditText.java b/core/java/android/widget/EditText.java
index 56c3e4a5ee77..336c20cdcdc0 100644
--- a/core/java/android/widget/EditText.java
+++ b/core/java/android/widget/EditText.java
@@ -105,6 +105,11 @@ public class EditText extends TextView {
@Override
public Editable getText() {
+ CharSequence text = super.getText();
+ if (text instanceof Editable) {
+ return (Editable) super.getText();
+ }
+ super.setText(text, BufferType.EDITABLE);
return (Editable) super.getText();
}