Merge "App compat" (19caf396) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -13953,7 +13953,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @return A new or reused DisplayList object.
		*/
		private DisplayList getDisplayList(DisplayList displayList, boolean isLayer) {
		if (!canHaveDisplayList()) {
		final HardwareRenderer renderer = getHardwareRenderer();
		if (renderer == null \|\| !canHaveDisplayList()) {
		return null;
		}

		@@ -14032,13 +14033,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		}
		} finally {
		displayList.end(getHardwareRenderer(), canvas);
		displayList.end(renderer, canvas);
		displayList.setCaching(caching);
		if (isLayer) {
		displayList.setLeftTopRightBottom(0, 0, width, height);
		} else {
		setDisplayListProperties(displayList);
		}

		if (renderer != getHardwareRenderer()) {
		Log.w(VIEW_LOG_TAG, "View was detached during a draw() call!");
		// TODO: Should this be elevated to a crash?
		// For now have it behaves the same as it previously did, it
		// will result in the DisplayListData being destroyed later
		// than it could be but oh well...
		}
		}
		} else if (!isLayer) {
		mPrivateFlags \|= PFLAG_DRAWN \| PFLAG_DRAWING_CACHE_VALID;