From 2b57efb262fe9ce2c54583f94c18b23fc17b2002 Mon Sep 17 00:00:00 2001
From: Tomasz Mikolajewski <mtomasz@google.com>
Date: Thu, 10 Mar 2016 15:58:32 +0900
Subject: [PATCH] Unhide ExifThumbnail.getThumbnailRange() and make it match
 the comment.

Bug: 27579803
Change-Id: If9fe16976cfbc0760a6afb3043d35e0ee387945c
---
 api/current.txt                             | 1 +
 api/system-current.txt                      | 1 +
 api/test-current.txt                        | 1 +
 media/java/android/media/ExifInterface.java | 6 +++++-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index dd70a3298aeb7..ea8d0560c35db 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20132,6 +20132,7 @@ package android.media {
     method public int getAttributeInt(java.lang.String, int);
     method public boolean getLatLong(float[]);
     method public byte[] getThumbnail();
+    method public long[] getThumbnailRange();
     method public boolean hasThumbnail();
     method public void saveAttributes() throws java.io.IOException;
     method public void setAttribute(java.lang.String, java.lang.String);
diff --git a/api/system-current.txt b/api/system-current.txt
index 0fe632d27d88a..8e8cf2241843b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -21623,6 +21623,7 @@ package android.media {
     method public int getAttributeInt(java.lang.String, int);
     method public boolean getLatLong(float[]);
     method public byte[] getThumbnail();
+    method public long[] getThumbnailRange();
     method public boolean hasThumbnail();
     method public void saveAttributes() throws java.io.IOException;
     method public void setAttribute(java.lang.String, java.lang.String);
diff --git a/api/test-current.txt b/api/test-current.txt
index d59fa272088de..ad10e92110baa 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -20197,6 +20197,7 @@ package android.media {
     method public int getAttributeInt(java.lang.String, int);
     method public boolean getLatLong(float[]);
     method public byte[] getThumbnail();
+    method public long[] getThumbnailRange();
     method public boolean hasThumbnail();
     method public void saveAttributes() throws java.io.IOException;
     method public void setAttribute(java.lang.String, java.lang.String);
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 4bf08527b594b..e82fbd8f4d451 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -1052,12 +1052,16 @@ public class ExifInterface {
      *
      * @return two-element array, the offset in the first value, and length in
      *         the second, or {@code null} if no thumbnail was found.
-     * @hide
      */
     public long[] getThumbnailRange() {
+        if (!mHasThumbnail) {
+            return null;
+        }
+
         long[] range = new long[2];
         range[0] = mThumbnailOffset;
         range[1] = mThumbnailLength;
+
         return range;
     }