commit 883f0ea84f92cb5e32548590380587cd056d9ec6
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Jan 29 08:19:42 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 29 08:19:42 2021 +0000
tree 490a18fdd3f4ba4c46d537d66dfda0666fa4b064
parent 197e3a0c3e41e0d927aa53ab891156b49b241613
parent 52d8a85de01b6155b88485434bd2ba403f2c2c34

Merge "Snap for 7110675 from d3b1a755e69a518ea85001d2d6b9077bc8d97db1 to sdk-release" into sdk-release

Android.bp

diff --git a/Android.bp b/Android.bp
index ca9a173..0b0d4e6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,5 +40,7 @@
 
     libs: ["org.apache.http.legacy"],
 
+    optional_uses_libs: ["com.google.android.media.effects"],
+
     jarjar_rules: "jarjar-rules.txt",
 }

src/com/android/gallery3d/filtershow/tools/SaveImage.java

diff --git a/src/com/android/gallery3d/filtershow/tools/SaveImage.java b/src/com/android/gallery3d/filtershow/tools/SaveImage.java
index c7d7b64..8711465 100644
--- a/src/com/android/gallery3d/filtershow/tools/SaveImage.java
+++ b/src/com/android/gallery3d/filtershow/tools/SaveImage.java
@@ -247,7 +247,7 @@
         if (mimeType == null) {
             mimeType = ImageLoader.getMimeType(mSelectedImageUri);
         }
-        if (mimeType.equals(ImageLoader.JPEG_MIME_TYPE)) {
+        if ((mimeType != null) && mimeType.equals(ImageLoader.JPEG_MIME_TYPE)) {
             InputStream inStream = null;
             try {
                 inStream = mContext.getContentResolver().openInputStream(source);