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

Update ExifInterface.getDateTime to support subseconds

Browse Source 
Also document that it returns local time.

Bug: 20638367
Change-Id: I6a1c35925e0555bcdcb079be0ca5b19a279a05a6
This commit is contained in:
Marco Nelissen
2015-05-29 14:49:03 -07:00
parent 25fc117a35
commit b2c890044e
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,11 @@ public class ExifInterface {
/** Type is String. */
public static final String TAG_ISO = "ISOSpeedRatings";
/**
* @hide
*/
public static final String TAG_SUBSECTIME = "SubSecTime";
/**
* The altitude (in meters) based on the reference in TAG_GPS_ALTITUDE_REF.
* Type is rational.
@@ -346,7 +351,7 @@ public class ExifInterface {
}
/**
* Returns number of milliseconds since Jan. 1, 1970, midnight.
* Returns number of milliseconds since Jan. 1, 1970, midnight local time.
* Returns -1 if the date time information if not available.
* @hide
*/
@@ -356,9 +361,24 @@ public class ExifInterface {
ParsePosition pos = new ParsePosition(0);
try {
// The exif field is in local time. Parsing it as if it is UTC will yield time
// since 1/1/1970 local time
Date datetime = sFormatter.parse(dateTimeString, pos);
if (datetime == null) return -1;
return datetime.getTime();
long msecs = datetime.getTime();
String subSecs = mAttributes.get(TAG_SUBSECTIME);
if (subSecs != null) {
try {
long sub = Long.valueOf(subSecs);
while (sub > 1000) {
sub /= 10;
}
msecs += sub;
} catch (NumberFormatException e) {
}
}
return msecs;
} catch (IllegalArgumentException ex) {
return -1;
}
@@ -375,7 +395,6 @@ public class ExifInterface {
if (date == null || time == null) return -1;
String dateTimeString = date + ' ' + time;
if (dateTimeString == null) return -1;
ParsePosition pos = new ParsePosition(0);
try {