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

Commit 6e2b9c13 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android Git Automerger
Browse files

am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce 

* commit 'afc46d5a':
  Fix saved video timestamps.
parents 41d628b3 afc46d5a

src/com/android/camera/VideoModule.java

+3 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.os.Message; 
import android.os.ParcelFileDescriptor;

import android.os.SystemClock;

import android.provider.MediaStore;

import android.provider.MediaStore.MediaColumns;

import android.provider.MediaStore.Video;

import android.util.Log;

import android.view.KeyEvent;
@@ -1344,10 +1345,11 @@ public class VideoModule implements CameraModule, 
        String mime = convertOutputFormatToMimeType(outputFileFormat);

        String path = Storage.DIRECTORY + '/' + filename;

        String tmpPath = path + ".tmp";

        mCurrentVideoValues = new ContentValues(7);

        mCurrentVideoValues = new ContentValues(9);

        mCurrentVideoValues.put(Video.Media.TITLE, title);

        mCurrentVideoValues.put(Video.Media.DISPLAY_NAME, filename);

        mCurrentVideoValues.put(Video.Media.DATE_TAKEN, dateTaken);

        mCurrentVideoValues.put(MediaColumns.DATE_MODIFIED, dateTaken / 1000);

        mCurrentVideoValues.put(Video.Media.MIME_TYPE, mime);

        mCurrentVideoValues.put(Video.Media.DATA, path);

        mCurrentVideoValues.put(Video.Media.RESOLUTION,