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

Merge "Make sure we clean up"

Browse Source
This commit is contained in:
Marco Nelissen
2014-07-01 18:10:37 +00:00
committed by Gerrit Code Review
parent 1dc550fa73 f3fd18d1b4
commit db816cef0d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/MediaScanner.java
View File

@@ -1184,6 +1184,7 @@ public class MediaScanner
HashSet<String> existingFiles = new HashSet<String>(); HashSet<String> existingFiles = new HashSet<String>();
String directory = "/sdcard/DCIM/.thumbnails"; String directory = "/sdcard/DCIM/.thumbnails";
String [] files = (new File(directory)).list(); String [] files = (new File(directory)).list();
Cursor c = null;
if (files == null) if (files == null)
files = new String[0]; files = new String[0];
@@ -1193,7 +1194,7 @@ public class MediaScanner
} }
try { try {
Cursor c = mMediaProvider.query( c = mMediaProvider.query(
mPackageName, mPackageName,
mThumbsUri, mThumbsUri,
new String [] { "_data" }, new String [] { "_data" },
@@ -1218,11 +1219,12 @@ public class MediaScanner
} }
Log.v(TAG, "/pruneDeadThumbnailFiles... " + c); Log.v(TAG, "/pruneDeadThumbnailFiles... " + c);
} catch (RemoteException e) {
// We will soon be killed...
} finally {
if (c != null) { if (c != null) {
c.close(); c.close();
} }
} catch (RemoteException e) {
// We will soon be killed...
} }
} }