Merge change 2167 into donut
* changes:
Add 30 minutes option for video recording duration.
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 7f40026..1743383 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1097,8 +1097,12 @@
// and the target for actions (play, delete, ...) will be correct.
if (!mIsVideoCaptureIntent) {
- mCurrentVideoUri = mThumbController.getUri();
- mCurrentVideoFilename = getDataPath(mCurrentVideoUri);
+ if (mThumbController.isUriValid()) {
+ mCurrentVideoUri = mThumbController.getUri();
+ mCurrentVideoFilename = getDataPath(mCurrentVideoUri);
+ } else {
+ return;
+ }
}
String path = mCurrentVideoFilename;