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

Commit e1d0cabb authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android (Google) Code Review
Browse files

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

parents 4afe32d4 2b57efb2

api/current.txt

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

    }