Merge change I397b6a93 into eclair
* changes:
Don't accidentally signal multiple exceptions in setThreadPriority()
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index c49ad5c..ba7e9bb 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -62,7 +62,8 @@
static {
System.loadLibrary("exif");
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;
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 079b4c3..4296afb 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -746,7 +746,7 @@
long time = exif.getDateTime();
if (time != -1) {
- values.put(Images.Media.DATE_TAKEN, time * 1000);
+ values.put(Images.Media.DATE_TAKEN, time);
}
int orientation = exif.getAttributeInt(