From 644e1375e80738d3c14108406937d5317b02ce2e Mon Sep 17 00:00:00 2001 From: Hyundo Moon Date: Mon, 23 Jan 2017 10:43:50 +0900 Subject: [PATCH] ExifInterface: Accept decimal values for RATIONAL formats Prior to android N, ExifInterface.setAttributes() accepted the decimal values for SRATIONAL/URATIONAL formats. However in android N, decimal values for RATIONAL formats are rejected. Since this behavior breaks the backward compatibility, we should make setAttributes() accept decimal values as before. Bug: 34269464 Test: flashed modified build on angler and tested with an app Change-Id: I9a77ce341c8c8c3ea74c8592b5a821243eb0257d --- media/java/android/media/ExifInterface.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index 52d5b7ca9188b..71f7790737033 100644 --- a/media/java/android/media/ExifInterface.java +++ b/media/java/android/media/ExifInterface.java @@ -1597,8 +1597,8 @@ public class ExifInterface { final Rational[] rationalArray = new Rational[values.length]; for (int j = 0; j < values.length; ++j) { final String[] numbers = values[j].split("/"); - rationalArray[j] = new Rational(Long.parseLong(numbers[0]), - Long.parseLong(numbers[1])); + rationalArray[j] = new Rational((long) Double.parseDouble(numbers[0]), + (long) Double.parseDouble(numbers[1])); } mAttributes[i].put(tag, ExifAttribute.createURational(rationalArray, mExifByteOrder)); @@ -1609,8 +1609,8 @@ public class ExifInterface { final Rational[] rationalArray = new Rational[values.length]; for (int j = 0; j < values.length; ++j) { final String[] numbers = values[j].split("/"); - rationalArray[j] = new Rational(Long.parseLong(numbers[0]), - Long.parseLong(numbers[1])); + rationalArray[j] = new Rational((long) Double.parseDouble(numbers[0]), + (long) Double.parseDouble(numbers[1])); } mAttributes[i].put(tag, ExifAttribute.createSRational(rationalArray, mExifByteOrder)); @@ -3442,8 +3442,8 @@ public class ExifInterface { String[] rationalNumber = entryValue.split("/"); if (rationalNumber.length == 2) { try { - long numerator = Long.parseLong(rationalNumber[0]); - long denominator = Long.parseLong(rationalNumber[1]); + long numerator = (long) Double.parseDouble(rationalNumber[0]); + long denominator = (long) Double.parseDouble(rationalNumber[1]); if (numerator < 0L || denominator < 0L) { return new Pair<>(IFD_FORMAT_SRATIONAL, -1); }