diff options
author | ztenghui <ztenghui@google.com> | 2013-10-09 20:24:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-09 20:24:27 +0000 |
commit | 70d24b5b602ae56784d7f7bd6d79af7d37095553 (patch) | |
tree | 3dd288d46f3905ae837ca29880107ee15ca0125f | |
parent | ef4dccf65c1077b8c7f28c26c9c2038c975fd94c (diff) | |
parent | 638bf9ae74f28ce7b6c0b3e6cbe3d6e09b677138 (diff) | |
download | android_packages_apps_Snap-70d24b5b602ae56784d7f7bd6d79af7d37095553.tar.gz android_packages_apps_Snap-70d24b5b602ae56784d7f7bd6d79af7d37095553.tar.bz2 android_packages_apps_Snap-70d24b5b602ae56784d7f7bd6d79af7d37095553.zip |
Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad
-rw-r--r-- | src/com/android/camera/VideoModule.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 263405eca..f4b1ca0b7 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -475,16 +475,17 @@ public class VideoModule implements CameraModule, @Override @OnClickAttr public void onReviewCancelClicked(View v) { - mIsInReviewMode = false; // 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. // When the video capture intent doesn't contain the Uri info and the // review is cancelled before taking a video, mCurrentVideoUri can be - // null. - if (mCurrentVideoUri != null) { + // null. Also make sure we don't delete the Uri sent from the video + // capture intent. + if (mIsInReviewMode && mCurrentVideoUri != null) { mContentResolver.delete(mCurrentVideoUri, null, null); } + mIsInReviewMode = false; doReturnToCaller(false); } |