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

Commit 8a576620 authored by Ray Chen's avatar Ray Chen Committed by Android Git Automerger
Browse files

am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371 

Merge commit '052d9c8b' into eclair-mr2

* commit '052d9c8b':
  Images.Media.DATE_TAKEN should be in milliseconds.
parents 6d72f725 052d9c8b

media/java/android/media/ExifInterface.java

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ public class ExifInterface { 
    static {

        System.loadLibrary("exif");

        sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");

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

        //TODO: uncomment this when our EXIF datetime is encoded as UTC

        //sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));

    }



    private String mFilename;

media/java/android/media/MediaScanner.java

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ public class MediaScanner 


                    long time = exif.getDateTime();

                    if (time != -1) {

                        values.put(Images.Media.DATE_TAKEN, time * 1000);

                        values.put(Images.Media.DATE_TAKEN, time);

                    }



                    int orientation = exif.getAttributeInt(