From 62532e55d650a39aec9d75b6a85af54fc4223cdc Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Tue, 7 May 2019 09:51:37 -0400 Subject: [PATCH] Sharesheet - Address misleading logs Log more informative warnings to assist developers in adding an optional preview section. Bug: 132152987 Test: Manual Change-Id: I4a97675315871317591d627cccc79da3f7e89d46 --- .../com/android/internal/app/ChooserActivity.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index b7d838edadc51..740753d9e5f11 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -779,7 +779,7 @@ public class ChooserActivity extends ResolverActivity { } } } catch (SecurityException | NullPointerException e) { - Log.w(TAG, "Error loading file preview", e); + logContentPreviewWarning(uri); } if (TextUtils.isEmpty(fileName)) { @@ -793,6 +793,14 @@ public class ChooserActivity extends ResolverActivity { return new FileInfo(fileName, hasThumbnail); } + private void logContentPreviewWarning(Uri uri) { + // The ContentResolver already logs the exception. Log something more informative. + Log.w(TAG, "Could not load (" + uri.toString() + ") thumbnail/name for preview. If " + + "desired, consider using Intent#createChooser to launch the ChooserActivity, " + + "and set your Intent's clipData and flags in accordance with that method's " + + "documentation"); + } + private ViewGroup displayFileContentPreview(Intent targetIntent, LayoutInflater layoutInflater, ViewGroup convertView, ViewGroup parent) { @@ -1664,7 +1672,7 @@ public class ChooserActivity extends ResolverActivity { try { return ImageUtils.loadThumbnail(getContentResolver(), uri, size); } catch (IOException | NullPointerException | SecurityException ex) { - Log.w(TAG, "Error loading preview thumbnail for uri: " + uri.toString(), ex); + logContentPreviewWarning(uri); } return null; }