summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-04-19 22:43:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-19 22:43:05 +0000
commitafc46d5a608ccfc1f370cc705e0c27eb0b678ded (patch)
tree823c7813249ca93420177f36085de0fdb77a8c8b /src/com
parent91d26f6c3b183862eeffc1856e2d758e800d13f4 (diff)
parent767962b715249b8a0cad0eea172a36bd1ba4a441 (diff)
downloadandroid_packages_apps_Gallery2-afc46d5a608ccfc1f370cc705e0c27eb0b678ded.tar.gz
android_packages_apps_Gallery2-afc46d5a608ccfc1f370cc705e0c27eb0b678ded.tar.bz2
android_packages_apps_Gallery2-afc46d5a608ccfc1f370cc705e0c27eb0b678ded.zip
Merge "Fix saved video timestamps." into gb-ub-photos-bryce
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/VideoModule.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index c7d45d95f..54d9f3633 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -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,