Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89c1c09e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix some memory leakage" am: d52e734a am: 2749aef8 

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



Change-Id: Ia360d236ffde95643a1700e688cd1a60d0378aec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd635e64 2749aef8

media/java/android/media/MediaCodec.java

+6 −1
Original line number Diff line number Diff line
@@ -3089,8 +3089,11 @@ final public class MediaCodec { 
                mValid = false;

                mNativeContext = 0;

            }



            if (!mInternal) {

                sPool.offer(this);

            }

        }



        private native void native_recycle();
@@ -3153,6 +3156,7 @@ final public class MediaCodec { 
            mNativeContext = context;

            mMappable = isMappable;

            mValid = (context != 0);

            mInternal = true;

        }



        private static final BlockingQueue<LinearBlock> sPool =
@@ -3163,6 +3167,7 @@ final public class MediaCodec { 
        private boolean mMappable = false;

        private ByteBuffer mMapped = null;

        private long mNativeContext = 0;

        private boolean mInternal = false;

    }



    /**