Fix timezone issue to comply with EXIF standard.
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 6cd4b92..c49ad5c 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -22,6 +22,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.TimeZone;
/**
* This is a class for reading and writing Exif tags in a JPEG file.
@@ -56,9 +57,12 @@
// Constants used for white balance
public static final int WHITEBALANCE_AUTO = 0;
public static final int WHITEBALANCE_MANUAL = 1;
+ private static SimpleDateFormat sFormatter;
static {
System.loadLibrary("exif");
+ sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
+ sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
}
private String mFilename;
@@ -242,9 +246,6 @@
}
}
- private static SimpleDateFormat sFormatter =
- new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
-
/**
* Returns number of milliseconds since Jan. 1, 1970, midnight GMT.
* Returns -1 if the date time information if not available.
