1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index aefe8d8..f32ae92 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6206,7 +6206,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             if (applyTransformation) {
                 setTransformationMethod(null);
             }
-            setBackgroundDrawable(mEditTextMultilineBackground);
+            // mEditTextMultilineBackground is defined and used only in EditText
+            if (mEditTextMultilineBackground != null) {
+                setBackgroundDrawable(mEditTextMultilineBackground);
+            }
         }
     }