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

Commit 5ef6b0d6 authored by Jin Seok Park's avatar Jin Seok Park
Browse files

Ensure thread-safety of SimpleDateFormat 

Since ExifInterface supports multi-thread, SimpleDateFormat
should be thread-safe.

Bug: 152801859
Test: N/A
Change-Id: I9ad5a035162f5e3caff2a2d4aaff2ae0cd870cd2
parent d972846b

media/java/android/media/ExifInterface.java

+14 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.system.OsConstants; 
import android.util.Log;

import android.util.Pair;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.ArrayUtils;



import libcore.io.IoUtils;
@@ -586,7 +587,9 @@ public class ExifInterface { 
    private static final int WEBP_CHUNK_SIZE_BYTE_LENGTH = 4;



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    @GuardedBy("sFormatter")

    private static SimpleDateFormat sFormatter;

    @GuardedBy("sFormatterTz")

    private static SimpleDateFormat sFormatterTz;



    // See Exchangeable image file format for digital still cameras: Exif version 2.2.
@@ -2426,13 +2429,18 @@ public class ExifInterface { 
        try {

            // The exif field is in local time. Parsing it as if it is UTC will yield time

            // since 1/1/1970 local time

            Date datetime = sFormatter.parse(dateTimeString, pos);

            Date datetime;

            synchronized (sFormatter) {

                datetime = sFormatter.parse(dateTimeString, pos);

            }



            if (offsetString != null) {

                dateTimeString = dateTimeString + " " + offsetString;

                ParsePosition position = new ParsePosition(0);

                synchronized (sFormatterTz) {

                    datetime = sFormatterTz.parse(dateTimeString, position);

                }

            }



            if (datetime == null) return -1;

            long msecs = datetime.getTime();
@@ -2473,7 +2481,10 @@ public class ExifInterface { 


        ParsePosition pos = new ParsePosition(0);

        try {

            Date datetime = sFormatter.parse(dateTimeString, pos);

            final Date datetime;

            synchronized (sFormatter) {

                datetime = sFormatter.parse(dateTimeString, pos);

            }

            if (datetime == null) return -1;

            return datetime.getTime();

        } catch (IllegalArgumentException e) {