Merge "Don't crash on Canvas.drawPicture()" (e7bdf2d9) · Commits · e / os / android_frameworks_base

core/java/android/view/GLES20Canvas.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -908,17 +908,17 @@ class GLES20Canvas extends HardwareCanvas {

		@Override
		public void drawPicture(Picture picture) {
		throw new UnsupportedOperationException();
		// TODO: Implement
		}

		@Override
		public void drawPicture(Picture picture, Rect dst) {
		throw new UnsupportedOperationException();
		// TODO: Implement
		}

		@Override
		public void drawPicture(Picture picture, RectF dst) {
		throw new UnsupportedOperationException();
		// TODO: Implement
		}

		@Override

+5 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,11 @@ public class Picture {
		}

		protected void finalize() throws Throwable {
		try {
		nativeDestructor(mNativePicture);
		} finally {
		super.finalize();
		}
		}

		/package/ final int ni() {