commit d6f4be8ee36f961382379476e94cd76869d2424a
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 13 02:54:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 13 02:54:15 2017 +0000
tree 23b385ede0ddcc2264cead9f2a855428e9106bd6
parent ccdc6b82b8ea4868c740409f8b68cc8f84467183
parent 4564cbceb4471ed3e318557a6a1c7f0999ff0d46

Merge "ExifInterface: Correct thumbnail compression info"

media/java/android/media/ExifInterface.java

diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 71f7790..0a61148 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -1938,6 +1938,9 @@
      * not exist or thumbnail image is uncompressed.
      */
     public boolean isThumbnailCompressed() {
+        if (!mHasThumbnail) {
+            return false;
+        }
         if (mThumbnailCompression == DATA_JPEG || mThumbnailCompression == DATA_JPEG_COMPRESSED) {
             return true;
         }
@@ -2974,7 +2977,6 @@
             }
         } else {
             // Thumbnail data may not contain Compression tag value
-            mThumbnailCompression = DATA_JPEG;
             handleThumbnailFromJfif(in, thumbnailData);
         }
     }
@@ -3009,6 +3011,8 @@
                 mHasThumbnail = true;
                 mThumbnailOffset = thumbnailOffset;
                 mThumbnailLength = thumbnailLength;
+                mThumbnailCompression = DATA_JPEG;
+
                 if (mFilename == null && mAssetInputStream == null
                         && mSeekableFileDescriptor == null) {
                     // Save the thumbnail in memory if the input doesn't support reading again.