summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Andrey Epin <ayepin@google.com> 2023-03-21 10:56:58 -0700
committer Andrey Epin <ayepin@google.com> 2023-03-21 14:11:13 -0700
commit4fc75124fe90daff88f213ba204a157e40ba2b96 (patch)
treeba8f344f2cf2c1eb1b58d6c426cfad2e7c6bbfc5 /java/src
parent3c3755b4ea535df1b5f2a9f3e57b235b660e1fcd (diff)
Do not crash on reading URI metadata
Do not crash if content resolver throws an exception while trying to read an URI metadata. Bug: 273890881 Test: check that the Chooser is not failing Change-Id: I161e29246bfcb1081a500b90c88c8c06c1d0df72
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
index 08cebf68..de454cfd 100644
--- a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
@@ -28,11 +28,11 @@ import android.content.res.Resources;
import android.database.Cursor;
import android.media.MediaMetadata;
import android.net.Uri;
-import android.os.RemoteException;
import android.provider.DocumentsContract;
import android.provider.Downloads;
import android.provider.OpenableColumns;
import android.text.TextUtils;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.ViewGroup;
@@ -351,7 +351,8 @@ public final class ChooserContentPreviewUi {
private static String getType(ContentInterface resolver, Uri uri) {
try {
return resolver.getType(uri);
- } catch (RemoteException e) {
+ } catch (Throwable t) {
+ Log.e(ContentPreviewUi.TAG, "Failed to read content type, uri: " + uri, t);
return null;
}
}
@@ -360,7 +361,8 @@ public final class ChooserContentPreviewUi {
private static Cursor query(ContentInterface resolver, Uri uri) {
try {
return resolver.query(uri, null, null, null);
- } catch (RemoteException e) {
+ } catch (Throwable t) {
+ Log.e(ContentPreviewUi.TAG, "Failed to read metadata, uri: " + uri, t);
return null;
}
}
@@ -369,7 +371,8 @@ public final class ChooserContentPreviewUi {
private static String[] getStreamTypes(ContentInterface resolver, Uri uri) {
try {
return resolver.getStreamTypes(uri, "*/*");
- } catch (RemoteException e) {
+ } catch (Throwable t) {
+ Log.e(ContentPreviewUi.TAG, "Failed to read stream types, uri: " + uri, t);
return null;
}
}