diff options
| author | Marco Nelissen <marcone@google.com> | 2011-10-11 16:34:38 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2011-10-11 16:34:38 -0700 |
| commit | df21a16539a9ca247899e8d85042bcb17d9ce4c1 (patch) | |
| tree | 6a1fae2c70bb54e0b8797cbe7a1f42b81fd66ee7 /src/com/android/providers/media/MediaScannerService.java | |
| parent | ff8d87f4492a2d7189daedb649a94ac537382050 (diff) | |
| download | android_packages_providers_MediaProvider-df21a16539a9ca247899e8d85042bcb17d9ce4c1.tar.gz android_packages_providers_MediaProvider-df21a16539a9ca247899e8d85042bcb17d9ce4c1.tar.bz2 android_packages_providers_MediaProvider-df21a16539a9ca247899e8d85042bcb17d9ce4c1.zip | |
Call scanCompleted with null Uri in case of failure.
b/3378173
Change-Id: Idaebf7f43f8c4935042b824f7f06849de747e13b
Diffstat (limited to 'src/com/android/providers/media/MediaScannerService.java')
| -rw-r--r-- | src/com/android/providers/media/MediaScannerService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/providers/media/MediaScannerService.java b/src/com/android/providers/media/MediaScannerService.java index d628d13c..99bd7348 100644 --- a/src/com/android/providers/media/MediaScannerService.java +++ b/src/com/android/providers/media/MediaScannerService.java @@ -231,7 +231,12 @@ public class MediaScannerService extends Service implements Runnable IBinder binder = arguments.getIBinder("listener"); IMediaScannerListener listener = (binder == null ? null : IMediaScannerListener.Stub.asInterface(binder)); - Uri uri = scanFile(filePath, arguments.getString("mimetype")); + Uri uri = null; + try { + uri = scanFile(filePath, arguments.getString("mimetype")); + } catch (Exception e) { + Log.e(TAG, "Exception scanning file", e); + } if (listener != null) { listener.scanCompleted(filePath, uri); } |