commit b6e7e7531dc47e449647026fd555c5433d7070f3
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 18 21:30:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 18 21:30:13 2018 +0000
tree d0abe6ba9b440ea04b005a21319f6977a22d9979
parent 2e54e410988333aaecb9757412e440144990fd5d
parent b102cc24354fb2e44964b60a794746df86be1eb7

Merge "Fix crash in EditText#getText"

core/java/android/widget/EditText.java

diff --git a/core/java/android/widget/EditText.java b/core/java/android/widget/EditText.java
index 336c20c..728824c 100644
--- a/core/java/android/widget/EditText.java
+++ b/core/java/android/widget/EditText.java
@@ -106,6 +106,10 @@
     @Override
     public Editable getText() {
         CharSequence text = super.getText();
+        // This can only happen during construction.
+        if (text == null) {
+            return null;
+        }
         if (text instanceof Editable) {
             return (Editable) super.getText();
         }