Merge "Make sure we clean up" (db816cef) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaScanner.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -1184,6 +1184,7 @@ public class MediaScanner
		HashSet<String> existingFiles = new HashSet<String>();
		String directory = "/sdcard/DCIM/.thumbnails";
		String [] files = (new File(directory)).list();
		Cursor c = null;
		if (files == null)
		files = new String[0];

		@@ -1193,7 +1194,7 @@ public class MediaScanner
		}

		try {
		Cursor c = mMediaProvider.query(
		c = mMediaProvider.query(
		mPackageName,
		mThumbsUri,
		new String [] { "_data" },
		@@ -1218,11 +1219,12 @@ public class MediaScanner
		}

		Log.v(TAG, "/pruneDeadThumbnailFiles... " + c);
		} catch (RemoteException e) {
		// We will soon be killed...
		} finally {
		if (c != null) {
		c.close();
		}
		} catch (RemoteException e) {
		// We will soon be killed...
		}
		}