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

Commit e40ab185 authored by Marco Nelissen's avatar Marco Nelissen Committed by Gerrit Code Review
Browse files

Merge "Fix memory leak in MediaScannerConnection"

parents 189bbd9f 3579b0e1

media/java/android/media/MediaScannerConnection.java

+5 −0
Original line number Diff line number Diff line
@@ -133,6 +133,10 @@ public class MediaScannerConnection implements ServiceConnection { 
                }

                try {

                    mContext.unbindService(this);

                    if (mClient instanceof ClientProxy) {

                        mClient = null;

                    }

                    mService = null;

                } catch (IllegalArgumentException ex) {

                    if (false) {

                        Log.v(TAG, "disconnect failed: " + ex);
@@ -205,6 +209,7 @@ public class MediaScannerConnection implements ServiceConnection { 
        void scanNextPath() {

            if (mNextPath >= mPaths.length) {

                mConnection.disconnect();

                mConnection = null;

                return;

            }

            String mimeType = mMimeTypes != null ? mMimeTypes[mNextPath] : null;