diff options
| author | Aleksandr Lukin <alukin@google.com> | 2023-12-06 13:50:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-06 13:50:39 +0000 |
| commit | f6d0a05db0dac2f1da167d43a990b0d534a9170a (patch) | |
| tree | d2d8829eaced5b7c47131a0bf70c28d2be21a47f | |
| parent | 45be743976ef42001294b28c78aa39e90154f33c (diff) | |
| parent | 375964fe6670577c5028a36fce5bfc2ba97a5deb (diff) | |
| download | MediaProvider-f6d0a05db0dac2f1da167d43a990b0d534a9170a.tar.gz | |
Merge "Catch crashes in onScanVolume" into udc-mainline-prod am: 375964fe66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/25502854
Change-Id: Ia599860908975056c1707e7c9108eb0602406c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/providers/media/MediaProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java index 4cea4359f..69a9d0247 100644 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -1586,8 +1586,8 @@ public class MediaProvider extends ContentProvider { try { MediaService.onScanVolume(getContext(), volume, REASON_IDLE); - } catch (IOException e) { - Log.w(TAG, e); + } catch (IOException | IllegalArgumentException e) { + Log.w(TAG, "Failure in " + volume.getName() + " volume scan", e); } // Ensure that our thumbnails are valid |