drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don\'t use timestamps with all zero"

Browse Source 
am: 9574e58027

* commit '9574e58027f8edeb539ecedf2988c1a302887807':
  Don't use timestamps with all zero
This commit is contained in:
Eino-Ville Talvala
2015-11-17 02:00:53 +00:00
committed by android-build-merger
parent 5995579f5f 9574e58027
commit be1a3f8b66
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,8 @@
package android.media; package android.media;
import java.io.IOException; import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.text.ParsePosition; import java.text.ParsePosition;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@ -128,6 +130,9 @@ public class ExifInterface {
// use sLock to serialize the accesses. // use sLock to serialize the accesses.
private static final Object sLock = new Object(); private static final Object sLock = new Object();
// Pattern to check non zero timestamp
private static final Pattern sNonZeroTimePattern = Pattern.compile(".*[1-9].*");
/** /**
* Reads Exif tags from the specified JPEG file. * Reads Exif tags from the specified JPEG file.
*/ */
@ -367,7 +372,8 @@ public class ExifInterface {
*/ */
public long getDateTime() { public long getDateTime() {
String dateTimeString = mAttributes.get(TAG_DATETIME); String dateTimeString = mAttributes.get(TAG_DATETIME);
if (dateTimeString == null) return -1; if (dateTimeString == null
|| !sNonZeroTimePattern.matcher(dateTimeString).matches()) return -1;
ParsePosition pos = new ParsePosition(0); ParsePosition pos = new ParsePosition(0);
try { try {
@ -402,7 +408,9 @@ public class ExifInterface {
public long getGpsDateTime() { public long getGpsDateTime() {
String date = mAttributes.get(TAG_GPS_DATESTAMP); String date = mAttributes.get(TAG_GPS_DATESTAMP);
String time = mAttributes.get(TAG_GPS_TIMESTAMP); String time = mAttributes.get(TAG_GPS_TIMESTAMP);
if (date == null || time == null) return -1; if (date == null || time == null
|| (!sNonZeroTimePattern.matcher(date).matches()
&& !sNonZeroTimePattern.matcher(time).matches())) return -1;
String dateTimeString = date + ' ' + time; String dateTimeString = date + ' ' + time;