Merge "Fix some memory leakage" into udc-dev (2f74eeed) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaCodec.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3181,8 +3181,11 @@ final public class MediaCodec {
	mValid = false;		mValid = false;
	mNativeContext = 0;		mNativeContext = 0;
	}		}

			if (!mInternal) {
	sPool.offer(this);		sPool.offer(this);
	}		}
			}

	private native void native_recycle();		private native void native_recycle();

	@@ -3245,6 +3248,7 @@ final public class MediaCodec {
	mNativeContext = context;		mNativeContext = context;
	mMappable = isMappable;		mMappable = isMappable;
	mValid = (context != 0);		mValid = (context != 0);
			mInternal = true;
	}		}

	private static final BlockingQueue<LinearBlock> sPool =		private static final BlockingQueue<LinearBlock> sPool =
	@@ -3255,6 +3259,7 @@ final public class MediaCodec {
	private boolean mMappable = false;		private boolean mMappable = false;
	private ByteBuffer mMapped = null;		private ByteBuffer mMapped = null;
	private long mNativeContext = 0;		private long mNativeContext = 0;
			private boolean mInternal = false;
	}		}

	/**		/**