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

DngCreator: Do not cache timezone in static initializer

Browse Source 
am: ec727411d2

Change-Id: I86d207b7bfd156f5296aa3f5ba5acecd2d762d4e
This commit is contained in:
Eino-Ville Talvala
2016-09-28 21:27:21 +00:00
committed by android-build-merger
parent e36d393d74 ec727411d2
commit fa141e303e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/hardware/camera2/DngCreator.java
View File

@@ -119,8 +119,14 @@ public final class DngCreator implements AutoCloseable {
captureTime = timestamp / 1000000 + timeOffset;
}
// Create this fresh each time since the time zone may change while a long-running application
// is active.
final DateFormat dateTimeStampFormat =
new SimpleDateFormat(TIFF_DATETIME_FORMAT);
dateTimeStampFormat.setTimeZone(TimeZone.getDefault());
// Format for metadata
String formattedCaptureTime = sDateTimeStampFormat.format(captureTime);
String formattedCaptureTime = dateTimeStampFormat.format(captureTime);
nativeInit(characteristics.getNativeCopy(), metadata.getNativeCopy(),
formattedCaptureTime);
@@ -467,13 +473,10 @@ public final class DngCreator implements AutoCloseable {
private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd";
private static final String TIFF_DATETIME_FORMAT = "yyyy:MM:dd HH:mm:ss";
private static final DateFormat sExifGPSDateStamp = new SimpleDateFormat(GPS_DATE_FORMAT_STR);
private static final DateFormat sDateTimeStampFormat =
new SimpleDateFormat(TIFF_DATETIME_FORMAT);
private final Calendar mGPSTimeStampCalendar = Calendar
.getInstance(TimeZone.getTimeZone("UTC"));
static {
sDateTimeStampFormat.setTimeZone(TimeZone.getDefault());
sExifGPSDateStamp.setTimeZone(TimeZone.getTimeZone("UTC"));
}