summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/view/View.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 12dc044a9938..4b6f2b072f43 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -14941,7 +14941,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
if (mBackgroundSizeChanged) {
// We should see the background invalidate itself, but just to be
// careful we're going to clear the display list and force redraw.
- mBackgroundDisplayList.clear();
+ if (mBackgroundDisplayList != null) {
+ mBackgroundDisplayList.clear();
+ }
+
background.setBounds(0, 0, mRight - mLeft, mBottom - mTop);
mBackgroundSizeChanged = false;
}