Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tomasz Mikolajewski
2016-03-31 03:47:40 +00:00
committed by Android (Google) Code Review
parent 4afe32d493 2b57efb262
commit e1d0cabb5f
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -20135,6 +20135,7 @@ package android.media {
method public int getAttributeInt(java.lang.String, int); method public int getAttributeInt(java.lang.String, int);
method public boolean getLatLong(float[]); method public boolean getLatLong(float[]);
method public byte[] getThumbnail(); method public byte[] getThumbnail();
method public long[] getThumbnailRange();
method public boolean hasThumbnail(); method public boolean hasThumbnail();
method public void saveAttributes() throws java.io.IOException; method public void saveAttributes() throws java.io.IOException;
method public void setAttribute(java.lang.String, java.lang.String); method public void setAttribute(java.lang.String, java.lang.String);

1
api/system-current.txt
View File

@@ -21627,6 +21627,7 @@ package android.media {
method public int getAttributeInt(java.lang.String, int); method public int getAttributeInt(java.lang.String, int);
method public boolean getLatLong(float[]); method public boolean getLatLong(float[]);
method public byte[] getThumbnail(); method public byte[] getThumbnail();
method public long[] getThumbnailRange();
method public boolean hasThumbnail(); method public boolean hasThumbnail();
method public void saveAttributes() throws java.io.IOException; method public void saveAttributes() throws java.io.IOException;
method public void setAttribute(java.lang.String, java.lang.String); method public void setAttribute(java.lang.String, java.lang.String);

1
api/test-current.txt
View File

@@ -20200,6 +20200,7 @@ package android.media {
method public int getAttributeInt(java.lang.String, int); method public int getAttributeInt(java.lang.String, int);
method public boolean getLatLong(float[]); method public boolean getLatLong(float[]);
method public byte[] getThumbnail(); method public byte[] getThumbnail();
method public long[] getThumbnailRange();
method public boolean hasThumbnail(); method public boolean hasThumbnail();
method public void saveAttributes() throws java.io.IOException; method public void saveAttributes() throws java.io.IOException;
method public void setAttribute(java.lang.String, java.lang.String); method public void setAttribute(java.lang.String, java.lang.String);

6
media/java/android/media/ExifInterface.java
View File

@@ -1079,12 +1079,16 @@ public class ExifInterface {
* *
* @return two-element array, the offset in the first value, and length in * @return two-element array, the offset in the first value, and length in
* the second, or {@code null} if no thumbnail was found. * the second, or {@code null} if no thumbnail was found.
* @hide
*/ */
public long[] getThumbnailRange() { public long[] getThumbnailRange() {
if (!mHasThumbnail) {
return null;
}
long[] range = new long[2]; long[] range = new long[2];
range[0] = mThumbnailOffset; range[0] = mThumbnailOffset;
range[1] = mThumbnailLength; range[1] = mThumbnailLength;
return range; return range;
} }