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

Commit 1b794bbb authored by Ray Chen's avatar Ray Chen Committed by Android Git Automerger
Browse files

am e12de4d5: Merge change Id5fa58cf into eclair

Merge commit 'e12de4d5' into eclair-mr2

* commit 'e12de4d5':
  Fix timezone issue to comply with EXIF standard.
parents 6d1ec0d8 e12de4d5
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.TimeZone;

/**
 * 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
    public static final int WHITEBALANCE_AUTO = 0;
    public static final int WHITEBALANCE_MANUAL = 1;
    private static SimpleDateFormat sFormatter;

    static {
        System.loadLibrary("exif");
        sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
        sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
    }

    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 -1 if the date time information if not available.