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

am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair

Browse Source 
Merge commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497' into eclair-mr2-plus-aosp

* commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497':
  Fix timezone issue to comply with EXIF standard.
This commit is contained in:
Ray Chen
2009-12-03 16:31:56 -08:00
committed by Android Git Automerger
parent 25bd4f29e1 1b794bbbdc
commit 29d503c6cc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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