Merge \"Fix memory leak in MediaScannerConnection\"

am: e40ab18590 Change-Id: I894584a5d193624acc78c20a6207b54b20b61563
2016-07-26 15:43:55 +00:00
parent 9495872add e40ab18590
commit 0d5bcda101
1 changed files with 5 additions and 0 deletions
--- a/media/java/android/media/MediaScannerConnection.java
+++ b/media/java/android/media/MediaScannerConnection.java
@@ -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;