Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some memory leakage" am: d52e734a2e am: 2749aef8c5 am: 89c1c09e35 am: 26da680d91

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117036

Change-Id: I7295263632c3990955901683c2fe0fc261d2b95a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-23 00:38:52 +00:00
committed by Automerger Merge Worker
parent 348ec785a9 26da680d91
commit 099616a96d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/MediaCodec.java
View File

@@ -3181,7 +3181,10 @@ final public class MediaCodec {
mValid = false; mValid = false;
mNativeContext = 0; mNativeContext = 0;
} }
sPool.offer(this);
if (!mInternal) {
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;
} }
/** /**