Merge "Fix memory leak in MediaScannerConnection" into nyc-mr1-dev (1f65a69d) · Commits · e / os / android_frameworks_base

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;