commit e116bcf72a71f96c0c5bfcd79a329c7c77eabf34
author Marco Nelissen <marcone@google.com> Tue Jul 26 16:03:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 26 16:03:52 2016 +0000
tree f7204b6cde201a39b74aa09eb190fafa7ad7f3e7
parent e828bb26b4e50b10efe6c7d64309e7d0c72e0d66
parent c737306bf9ecfcd6217790124091a53af2a3ca09

Merge \\\\"Fix memory leak in MediaScannerConnection\\\\" am: e40ab18590 am: 0d5bcda101 am: fd743b4d56
am: c737306bf9

Change-Id: I6ac82941cb1d5facab286d3ece9966908f6996a9

media/java/android/media/MediaScannerConnection.java

diff --git a/media/java/android/media/MediaScannerConnection.java b/media/java/android/media/MediaScannerConnection.java
index d714672..471fa2c 100644
--- a/media/java/android/media/MediaScannerConnection.java
+++ b/media/java/android/media/MediaScannerConnection.java
@@ -133,6 +133,10 @@
                 }
                 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 @@
         void scanNextPath() {
             if (mNextPath >= mPaths.length) {
                 mConnection.disconnect();
+                mConnection = null;
                 return;
             }
             String mimeType = mMimeTypes != null ? mMimeTypes[mNextPath] : null;