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

Merge "ExifInterface: Make saveAttributes throw an exception before change" into nyc-mr1-dev

Browse Source
This commit is contained in:
Sungsoo Lim
2016-08-24 01:53:19 +00:00
committed by Android (Google) Code Review
parent e846b18d33 a8f9a075b1
commit c23c2771de
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -679,14 +679,14 @@ public class ExifInterface {
if (value instanceof long[]) { if (value instanceof long[]) {
long[] array = (long[]) value; long[] array = (long[]) value;
if (array.length == 1) { if (array.length == 1) {
return (double) array[0]; return array[0];
} }
throw new NumberFormatException("There are more than one component"); throw new NumberFormatException("There are more than one component");
} }
if (value instanceof int[]) { if (value instanceof int[]) {
int[] array = (int[]) value; int[] array = (int[]) value;
if (array.length == 1) { if (array.length == 1) {
return (double) array[0]; return array[0];
} }
throw new NumberFormatException("There are more than one component"); throw new NumberFormatException("There are more than one component");
} }
@@ -1083,6 +1083,7 @@ public class ExifInterface {
private int mThumbnailOffset; private int mThumbnailOffset;
private int mThumbnailLength; private int mThumbnailLength;
private byte[] mThumbnailBytes; private byte[] mThumbnailBytes;
private boolean mIsSupportedFile;
// Pattern to check non zero timestamp // Pattern to check non zero timestamp
private static final Pattern sNonZeroTimePattern = Pattern.compile(".*[1-9].*"); private static final Pattern sNonZeroTimePattern = Pattern.compile(".*[1-9].*");
@@ -1472,9 +1473,11 @@ public class ExifInterface {
// Process JPEG input stream // Process JPEG input stream
getJpegAttributes(in); getJpegAttributes(in);
mIsSupportedFile = true;
} catch (IOException e) { } catch (IOException e) {
// Ignore exceptions in order to keep the compatibility with the old versions of // Ignore exceptions in order to keep the compatibility with the old versions of
// ExifInterface. // ExifInterface.
mIsSupportedFile = false;
Log.w(TAG, "Invalid image: ExifInterface got an unsupported image format file" Log.w(TAG, "Invalid image: ExifInterface got an unsupported image format file"
+ "(ExifInterface supports JPEG and some RAW image formats only) " + "(ExifInterface supports JPEG and some RAW image formats only) "
+ "or a corrupted JPEG file to ExifInterface.", e); + "or a corrupted JPEG file to ExifInterface.", e);
@@ -1553,9 +1556,9 @@ public class ExifInterface {
* and make a single call rather than multiple calls for each attribute. * and make a single call rather than multiple calls for each attribute.
*/ */
public void saveAttributes() throws IOException { public void saveAttributes() throws IOException {
if (mIsRaw) { if (!mIsSupportedFile || mIsRaw) {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"ExifInterface does not support saving attributes on RAW formats."); "ExifInterface only supports saving attributes on JPEG formats.");
} }
if (mIsInputStream || (mSeekableFileDescriptor == null && mFilename == null)) { if (mIsInputStream || (mSeekableFileDescriptor == null && mFilename == null)) {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
@@ -2352,7 +2355,7 @@ public class ExifInterface {
for (int i = 0; i < EXIF_TAGS.length; ++i) { for (int i = 0; i < EXIF_TAGS.length; ++i) {
int sum = 0; int sum = 0;
for (Map.Entry entry : (Set<Map.Entry>) mAttributes[i].entrySet()) { for (Map.Entry entry : (Set<Map.Entry>) mAttributes[i].entrySet()) {
final ExifAttribute exifAttribute = (ExifAttribute) ((Map.Entry) entry).getValue(); final ExifAttribute exifAttribute = (ExifAttribute) entry.getValue();
final int size = exifAttribute.size(); final int size = exifAttribute.size();
if (size > 4) { if (size > 4) {
sum += size; sum += size;