diff options
| author | ztenghui <ztenghui@google.com> | 2013-09-18 00:02:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-18 00:02:45 +0000 |
| commit | e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc (patch) | |
| tree | bfd176b0aa1cdc9f4824bd5b9371bd278d0733dd | |
| parent | 15125661ad968cf4d40989a9bc88d11189beb0b3 (diff) | |
| parent | af3a19761034225333685b90206dcdb8e784a1c4 (diff) | |
| download | android_packages_apps_Snap-e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc.tar.gz android_packages_apps_Snap-e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc.tar.bz2 android_packages_apps_Snap-e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc.zip | |
Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index bf5ef8942..b30905fb8 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); } |