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

Commit c7fd499d authored by Hongguang Chen's avatar Hongguang Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix some memory leakage" into udc-dev am: 2f74eeed 

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



Change-Id: I7adcecc0e522a56c4b9a6156a283e1adf3510256
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60820cec 2f74eeed

media/java/android/media/MediaCodec.java

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

                mNativeContext = 0;

            }



            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;

    }



    /**