diff options
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index 06a8f4c247cd..4599bd6b3d8a 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -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... } } |