Merge "Merge "Add an O-release targetAPI check for Canvas.setBitmap. am:... (eeb5f381) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -4462,6 +4462,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		sIgnoreMeasureCache = targetSdkVersion < Build.VERSION_CODES.KITKAT;

		Canvas.sCompatibilityRestore = targetSdkVersion < Build.VERSION_CODES.M;
		Canvas.sCompatibilitySetBitmap = targetSdkVersion < Build.VERSION_CODES.O;

		// In M and newer, our widgets can pass a "hint" value in the size
		// for UNSPECIFIED MeasureSpecs. This lets child views of scrolling containers

+11 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ import javax.microedition.khronos.opengles.GL;
		public class Canvas extends BaseCanvas {
		/** @hide */
		public static boolean sCompatibilityRestore = false;
		/** @hide */
		public static boolean sCompatibilitySetBitmap = false;

		/** @hide */
		public long getNativeCanvasWrapper() {
		@@ -172,6 +174,11 @@ public class Canvas extends BaseCanvas {
		throw new RuntimeException("Can't set a bitmap device on a HW accelerated canvas");
		}

		Matrix preservedMatrix = null;
		if (bitmap != null && sCompatibilitySetBitmap) {
		preservedMatrix = getMatrix();
		}

		if (bitmap == null) {
		nSetBitmap(mNativeCanvasWrapper, null);
		mDensity = Bitmap.DENSITY_NONE;
		@@ -185,6 +192,10 @@ public class Canvas extends BaseCanvas {
		mDensity = bitmap.mDensity;
		}

		if (preservedMatrix != null) {
		setMatrix(preservedMatrix);
		}

		mBitmap = bitmap;
		}