Merge "Fix some memory leakage" am: d52e734a2e am: 2749aef8c5 am: 89c1c09e35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117036 Change-Id: I5612d4b507f125a212d585eb28d179565039b073 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -3181,7 +3181,10 @@ final public class MediaCodec {
|
||||
mValid = false;
|
||||
mNativeContext = 0;
|
||||
}
|
||||
sPool.offer(this);
|
||||
|
||||
if (!mInternal) {
|
||||
sPool.offer(this);
|
||||
}
|
||||
}
|
||||
|
||||
private native void native_recycle();
|
||||
@@ -3245,6 +3248,7 @@ final public class MediaCodec {
|
||||
mNativeContext = context;
|
||||
mMappable = isMappable;
|
||||
mValid = (context != 0);
|
||||
mInternal = true;
|
||||
}
|
||||
|
||||
private static final BlockingQueue<LinearBlock> sPool =
|
||||
@@ -3255,6 +3259,7 @@ final public class MediaCodec {
|
||||
private boolean mMappable = false;
|
||||
private ByteBuffer mMapped = null;
|
||||
private long mNativeContext = 0;
|
||||
private boolean mInternal = false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user