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

Commit e116bcf7 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge \\\\"Fix memory leak in MediaScannerConnection\\\\" am: e40ab185 am:... 

Merge \\\\"Fix memory leak in MediaScannerConnection\\\\" am: e40ab185 am: 0d5bcda1 am: fd743b4d
am: c737306b

Change-Id: I6ac82941cb1d5facab286d3ece9966908f6996a9
parents e828bb26 c737306b

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;