summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-09-17 16:51:15 -0700
committerztenghui <ztenghui@google.com>2013-09-17 16:51:15 -0700
commitaf3a19761034225333685b90206dcdb8e784a1c4 (patch)
treea45d5717c8569d5edb96d531b6271b454dfd0f39 /src
parent05804751ba07c8abcf422f57467d0ed3de95576c (diff)
downloadandroid_packages_apps_Snap-af3a19761034225333685b90206dcdb8e784a1c4.tar.gz
android_packages_apps_Snap-af3a19761034225333685b90206dcdb8e784a1c4.tar.bz2
android_packages_apps_Snap-af3a19761034225333685b90206dcdb8e784a1c4.zip
Delete the captured video if cancel in review.
In capture intent case, video get inserted all the time before review. So if cancelled in review mode, the captured video should be deleted. bug:8897671 Change-Id: I01dd4b0707dd1b70480cda94b2a9b9c6ce9194c7
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/VideoModule.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 56882e1cf..49250d8c8 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -480,7 +480,10 @@ public class VideoModule implements CameraModule,
@OnClickAttr
public void onReviewCancelClicked(View v) {
mIsInReviewMode = false;
- stopVideoRecording();
+ // TODO: It should be better to not even insert the URI at all before we
+ // confirm done in review, which means we need to handle temporary video
+ // files in a quite different way than we currently had.
+ mContentResolver.delete(mCurrentVideoUri, null, null);
doReturnToCaller(false);
}