Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e3bb26f authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev

parents cd339f21 ec727411

core/java/android/hardware/camera2/DngCreator.java

+7 −4
Original line number Original line Diff line number Diff line
@@ -119,8 +119,14 @@ public final class DngCreator implements AutoCloseable { 
            captureTime = timestamp / 1000000 + timeOffset;

            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

        // Format for metadata

        String formattedCaptureTime = sDateTimeStampFormat.format(captureTime);

        String formattedCaptureTime = dateTimeStampFormat.format(captureTime);





        nativeInit(characteristics.getNativeCopy(), metadata.getNativeCopy(),

        nativeInit(characteristics.getNativeCopy(), metadata.getNativeCopy(),

                formattedCaptureTime);

                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 GPS_DATE_FORMAT_STR = "yyyy:MM:dd";

    private static final String TIFF_DATETIME_FORMAT = "yyyy:MM:dd HH:mm:ss";

    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);

    private static final DateFormat sDateTimeStampFormat =

            new SimpleDateFormat(TIFF_DATETIME_FORMAT);

    private final Calendar mGPSTimeStampCalendar = Calendar

    private final Calendar mGPSTimeStampCalendar = Calendar

            .getInstance(TimeZone.getTimeZone("UTC"));

            .getInstance(TimeZone.getTimeZone("UTC"));





    static {

    static {

        sDateTimeStampFormat.setTimeZone(TimeZone.getDefault());

        sExifGPSDateStamp.setTimeZone(TimeZone.getTimeZone("UTC"));

        sExifGPSDateStamp.setTimeZone(TimeZone.getTimeZone("UTC"));

    }

    }