Merge "Camera: Address an issue that the invalid memory is accessed" into udc-dev (36d5df64) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/GraphicBuffer.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ public class GraphicBuffer implements Parcelable {
		private final int mUsage;
		// Note: do not rename, this field is used by native code
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private final long mNativeObject;
		private long mNativeObject;

		// These two fields are only used by lock/unlockCanvas()
		private Canvas mCanvas;
		@@ -219,6 +219,7 @@ public class GraphicBuffer implements Parcelable {
		if (!mDestroyed) {
		mDestroyed = true;
		nDestroyGraphicBuffer(mNativeObject);
		mNativeObject = 0;
		}
		}

		@@ -239,7 +240,7 @@ public class GraphicBuffer implements Parcelable {
		@Override
		protected void finalize() throws Throwable {
		try {
		if (!mDestroyed) nDestroyGraphicBuffer(mNativeObject);
		destroy();
		} finally {
		super.finalize();
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -768,6 +768,7 @@ static void ImageReader_unlockGraphicBuffer(JNIEnv* env, jobject /thiz/,
		android_graphics_GraphicBuffer_getNativeGraphicsBuffer(env, buffer);
		if (graphicBuffer.get() == NULL) {
		jniThrowRuntimeException(env, "Invalid graphic buffer!");
		return;
		}

		status_t res = graphicBuffer->unlock();

+5 −1

Original line number	Diff line number	Diff line
		@@ -2057,7 +2057,11 @@ public class CameraExtensionsProxyService extends Service {
		mIsImageValid = false;

		if (mGraphicBuffer != null) {
		try {
		ImageReader.unlockGraphicBuffer(mGraphicBuffer);
		} catch (RuntimeException e) {
		e.printStackTrace();
		}
		mGraphicBuffer.destroy();
		mGraphicBuffer = null;
		}