Merge "DisplayList lifecycle fixes" (8f649dda) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -13128,8 +13128,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		private void cleanupDraw() {
		resetDisplayList();
		if (mAttachInfo != null) {
		mAttachInfo.mViewRootImpl.cancelInvalidate(this);
		}
		}

		/**
		* This method ensures the hardware renderer is in a valid state
		@@ -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;