Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix memory leak in MediaScannerConnection"

Browse Source
This commit is contained in:
Marco Nelissen
2016-07-26 15:37:32 +00:00
committed by Gerrit Code Review
parent 189bbd9f6d 3579b0e1a7
commit e40ab18590
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/MediaScannerConnection.java
View File

@@ -133,6 +133,10 @@ public class MediaScannerConnection implements ServiceConnection {
} }
try { try {
mContext.unbindService(this); mContext.unbindService(this);
if (mClient instanceof ClientProxy) {
mClient = null;
}
mService = null;
} catch (IllegalArgumentException ex) { } catch (IllegalArgumentException ex) {
if (false) { if (false) {
Log.v(TAG, "disconnect failed: " + ex); Log.v(TAG, "disconnect failed: " + ex);
@@ -205,6 +209,7 @@ public class MediaScannerConnection implements ServiceConnection {
void scanNextPath() { void scanNextPath() {
if (mNextPath >= mPaths.length) { if (mNextPath >= mPaths.length) {
mConnection.disconnect(); mConnection.disconnect();
mConnection = null;
return; return;
} }
String mimeType = mMimeTypes != null ? mMimeTypes[mNextPath] : null; String mimeType = mMimeTypes != null ? mMimeTypes[mNextPath] : null;