commit aeccfd0ef54838fc2f1a05269c94f5a2a55f79c3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 04 02:26:48 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 04 02:26:48 2021 +0000
tree e4482db295ea3c7ac446f121d04e92aa334354a3
parent 66ef787a0132caa1adc5bd339c2244c293f93c57
parent a766f4ea246265ee75f256950754957baa6c567e

Merge "Broaden exception criteria for failed image URI resolution"

src/com/android/bluetooth/audio_util/helpers/Image.java

diff --git a/src/com/android/bluetooth/audio_util/helpers/Image.java b/src/com/android/bluetooth/audio_util/helpers/Image.java
index 1dd04c1..c0623c6 100644
--- a/src/com/android/bluetooth/audio_util/helpers/Image.java
+++ b/src/com/android/bluetooth/audio_util/helpers/Image.java
@@ -24,7 +24,6 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -189,7 +188,8 @@
             if (mContext == null) return null;
             input = mContext.getContentResolver().openInputStream(uri);
             art = BitmapFactory.decodeStream(input);
-        } catch (FileNotFoundException e) {
+        } catch (Exception e) {
+            Log.w("Failed to fetch image at uri=" + uri, e);
             art = null;
         }
         try {

tests/unit/src/com/android/bluetooth/audio_util/ImageTest.java

diff --git a/tests/unit/src/com/android/bluetooth/audio_util/ImageTest.java b/tests/unit/src/com/android/bluetooth/audio_util/ImageTest.java
index 0188fa9..89bbf5c 100644
--- a/tests/unit/src/com/android/bluetooth/audio_util/ImageTest.java
+++ b/tests/unit/src/com/android/bluetooth/audio_util/ImageTest.java
@@ -67,6 +67,11 @@
             .build();
     private static final String IMAGE_STRING_1 = IMAGE_URI_1.toString();
 
+    private static final String IMAGE_HANDLE_SECURITY_ERROR = "sec_error";
+    private static final Uri IMAGE_URI_SECURITY_ERROR = TEST_CONTENT_URI.buildUpon()
+            .appendQueryParameter("handle", IMAGE_HANDLE_SECURITY_ERROR)
+            .build();
+
     private Bitmap mTestBitmap = null;
 
     @Before
@@ -91,6 +96,8 @@
                 if (IMAGE_URI_1.equals(url)) {
                     return mTestResources.openRawResourceFd(
                             com.android.bluetooth.tests.R.raw.image_200_200);
+                } else if (IMAGE_URI_SECURITY_ERROR.equals(url)) {
+                    throw new SecurityException();
                 }
                 return null;
             }
@@ -444,6 +451,18 @@
     }
 
     /**
+     * Make sure image URI resolution with erroneous resources doesn't crash and results in a null
+     * image.
+     */
+    @Test
+    public void testLoadImageFromUriWithSecurityException() {
+        Image artwork = new Image(mMockContext, IMAGE_URI_SECURITY_ERROR);
+        assertThat(artwork.getImageHandle()).isNull();
+        assertThat(artwork.getSource()).isEqualTo(Image.SOURCE_NONE);
+        assertThat(artwork.getImage()).isNull();
+    }
+
+    /**
      * Make sure you can get a string representation of this Image
      */
     @Test