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

am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371

Browse Source 
Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp

* commit '8a576620cdc7257fc026026c77f7c946bfb760d1':
  Images.Media.DATE_TAKEN should be in milliseconds.
This commit is contained in:
Ray Chen
2009-12-04 12:02:04 -08:00
committed by Android Git Automerger
parent a1a68a4a2d 8a576620cd
commit da32419584
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,8 @@ public class ExifInterface {
static { static {
System.loadLibrary("exif"); System.loadLibrary("exif");
sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss"); sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
sFormatter.setTimeZone(TimeZone.getTimeZone("UTC")); //TODO: uncomment this when our EXIF datetime is encoded as UTC
//sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
} }
private String mFilename; private String mFilename;

2
media/java/android/media/MediaScanner.java
View File

@@ -746,7 +746,7 @@ public class MediaScanner
long time = exif.getDateTime(); long time = exif.getDateTime();
if (time != -1) { if (time != -1) {
values.put(Images.Media.DATE_TAKEN, time * 1000); values.put(Images.Media.DATE_TAKEN, time);
} }
int orientation = exif.getAttributeInt( int orientation = exif.getAttributeInt(