diff options
| -rw-r--r-- | core/java/android/view/View.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 31b8b04a03c3..a57b3111cae7 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -13128,7 +13128,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private void cleanupDraw() { resetDisplayList(); - mAttachInfo.mViewRootImpl.cancelInvalidate(this); + if (mAttachInfo != null) { + mAttachInfo.mViewRootImpl.cancelInvalidate(this); + } } /** @@ -15254,9 +15256,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mBackgroundSizeChanged = false; } - // Attempt to use a display list if requested. - if (canvas != null && canvas.isHardwareAccelerated()) { + if (canvas.isHardwareAccelerated() && mAttachInfo != null + && mAttachInfo.mHardwareRenderer != null) { mBackgroundDisplayList = getDrawableDisplayList(background, mBackgroundDisplayList); final DisplayList displayList = mBackgroundDisplayList; |