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

Commit 488e925f authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev

* commit '8716c081':
  Use correct timescale for "date taken" field
parents 23d6b7b3 8716c081
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -196,7 +196,8 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi
            // Create screenshot directory if it doesn't exist
            // Create screenshot directory if it doesn't exist
            mScreenshotDir.mkdirs();
            mScreenshotDir.mkdirs();


            // media provider uses seconds, not milliseconds
            // media provider uses seconds for DATE_MODIFIED and DATE_ADDED, but milliseconds
            // for DATE_TAKEN
            long dateSeconds = mImageTime / 1000;
            long dateSeconds = mImageTime / 1000;


            // Save the screenshot to the MediaStore
            // Save the screenshot to the MediaStore
@@ -205,7 +206,7 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi
            values.put(MediaStore.Images.ImageColumns.DATA, mImageFilePath);
            values.put(MediaStore.Images.ImageColumns.DATA, mImageFilePath);
            values.put(MediaStore.Images.ImageColumns.TITLE, mImageFileName);
            values.put(MediaStore.Images.ImageColumns.TITLE, mImageFileName);
            values.put(MediaStore.Images.ImageColumns.DISPLAY_NAME, mImageFileName);
            values.put(MediaStore.Images.ImageColumns.DISPLAY_NAME, mImageFileName);
            values.put(MediaStore.Images.ImageColumns.DATE_TAKEN, dateSeconds);
            values.put(MediaStore.Images.ImageColumns.DATE_TAKEN, mImageTime);
            values.put(MediaStore.Images.ImageColumns.DATE_ADDED, dateSeconds);
            values.put(MediaStore.Images.ImageColumns.DATE_ADDED, dateSeconds);
            values.put(MediaStore.Images.ImageColumns.DATE_MODIFIED, dateSeconds);
            values.put(MediaStore.Images.ImageColumns.DATE_MODIFIED, dateSeconds);
            values.put(MediaStore.Images.ImageColumns.MIME_TYPE, "image/png");
            values.put(MediaStore.Images.ImageColumns.MIME_TYPE, "image/png");