commit 439e5e49fb3278662889d057e578f2e08f347ad5
author xiaoli.xb.zuo <xiaoli.xb.zuo@sonymobile.com> Wed Jul 13 14:37:58 2016 +0900
committer Marco Nelissen <marcone@google.com> Thu Sep 08 09:08:18 2016 -0700
tree f0524abcd4e1caa9072bd304f864e81d8141b410
parent 6c99793491723d3e6decd4394428781bb109fe2d

Fix memory leak in MediaScannerConnection

This patch adds releasing of MediaScannerConnection in ClientProxy
after disconnecting and releasing of ClientProxy and
IMediaScannerService in disconnection sequence in
MediaScannerConnection.

Bug: 30150344

Change-Id: I1e162e4c9a0b7a741ace20480bcf06f3151a93bf

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;