commit 02a4bc4e65137f4a9d2095f082097d42c0c59fe0
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 02 22:49:58 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 02 22:49:58 2020 +0000
tree cdbb9dfc7ec938ddcaae5888188cbbcc4d2d6d19
parent dd82eec834e57811bd76057b42c071f609da9b92
parent d708d16748910e158b1575b14dae9abb2b08f9ca

Merge "Fix Gallery keeps stopping issue when edit and save a picture." am: d708d16748

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1471522

Change-Id: Iaac877f68839f1d7db80ba65f265621956e6c5c5

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);