Merge "fix [2615973] ViewRoot locks the Surface even when the dirty region is empty" into kraken (62801264) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRoot.java

+86 −84

Original line number	Diff line number	Diff line
		@@ -1332,6 +1332,7 @@ public final class ViewRoot extends Handler implements ViewParent,
		appScale + ", width=" + mWidth + ", height=" + mHeight);
		}

		if (!dirty.isEmpty() \|\| mIsAnimating) {
		Canvas canvas;
		try {
		int left = dirty.left;
		@@ -1430,6 +1431,7 @@ public final class ViewRoot extends Handler implements ViewParent,
		} finally {
		surface.unlockCanvasAndPost(canvas);
		}
		}

		if (LOCAL_LOGV) {
		Log.v("ViewRoot", "Surface " + surface + " unlockCanvasAndPost");