Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 30f435e74..263405eca 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -479,7 +479,12 @@ public class VideoModule implements CameraModule,
         // 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);
+        // 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) {
+            mContentResolver.delete(mCurrentVideoUri, null, null);
+        }
         doReturnToCaller(false);
     }