diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2017-10-10 15:20:13 -0400 |
|---|---|---|
| committer | Justin Klaassen <justinklaassen@google.com> | 2017-10-10 15:20:13 -0400 |
| commit | 93b7ee4fce01df52a6607f0b1965cbafdfeaf1a6 (patch) | |
| tree | 49f76f879a89c256a4f65b674086be50760bdffb /android/hardware/camera2 | |
| parent | bc81c7ada5aab3806dd0b17498f5c9672c9b33c4 (diff) | |
| download | android-28-93b7ee4fce01df52a6607f0b1965cbafdfeaf1a6.tar.gz | |
Import Android SDK Platform P [4386628]
/google/data/ro/projects/android/fetch_artifact \
--bid 4386628 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4386628.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: I9b8400ac92116cae4f033d173f7a5682b26ccba9
Diffstat (limited to 'android/hardware/camera2')
| -rw-r--r-- | android/hardware/camera2/DngCreator.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/android/hardware/camera2/DngCreator.java b/android/hardware/camera2/DngCreator.java index 1a51acd6..cc484eaf 100644 --- a/android/hardware/camera2/DngCreator.java +++ b/android/hardware/camera2/DngCreator.java @@ -18,7 +18,6 @@ package android.hardware.camera2; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.Nullable; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.ImageFormat; @@ -37,6 +36,7 @@ import java.nio.ByteBuffer; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Locale; import java.util.TimeZone; /** @@ -122,7 +122,7 @@ public final class DngCreator implements AutoCloseable { // 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); + new SimpleDateFormat(TIFF_DATETIME_FORMAT, Locale.US); dateTimeStampFormat.setTimeZone(TimeZone.getDefault()); // Format for metadata @@ -472,7 +472,8 @@ 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 sExifGPSDateStamp = + new SimpleDateFormat(GPS_DATE_FORMAT_STR, Locale.US); private final Calendar mGPSTimeStampCalendar = Calendar .getInstance(TimeZone.getTimeZone("UTC")); |