Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3720f795 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by android-build-merger
Browse files

Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the... 

Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev am: e1d0cabb
am: f2c62df0

* commit 'f2c62df0':
  Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.

Change-Id: I59b4cb74bacbafc22a7e0305813a039d132f65bd
parents e78e7ff5 f2c62df0

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20138,6 +20138,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);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21630,6 +21630,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);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20203,6 +20203,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);

media/java/android/media/ExifInterface.java

+5 −1
Original line number Diff line number Diff line
@@ -1079,12 +1079,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;

    }