summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoCamera.java
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-05-05 15:37:25 +0800
committerWu-cheng Li <wuchengli@google.com>2011-05-06 13:01:53 +0800
commit9fff0f154b8531094aa1349e0241a998c14da810 (patch)
tree19187b2541e8fd2c612297a6fe4c9b4f80bc649e /src/com/android/camera/VideoCamera.java
parent3d108b88030763f102398487e9b9e74fb67b47a8 (diff)
downloadLegacyCamera-9fff0f154b8531094aa1349e0241a998c14da810.zip
LegacyCamera-9fff0f154b8531094aa1349e0241a998c14da810.tar.gz
LegacyCamera-9fff0f154b8531094aa1349e0241a998c14da810.tar.bz2
Pass camera id while getting camcorder profile.
This also prevents NPE during variable initialization if camera module fails to load. When camera module fails to load, CamcorderProfile.get(int) will return null. bug:4381780 Change-Id: I14a9af9e6f172cd02ef6df11ed81f1655361618a
Diffstat (limited to 'src/com/android/camera/VideoCamera.java')
-rw-r--r--src/com/android/camera/VideoCamera.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 03944a1..dd7088b 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -725,7 +725,7 @@ public class VideoCamera extends ActivityBase
mMaxVideoDurationInMs = 1000 * seconds;
} else {
mMaxVideoDurationInMs =
- CameraSettings.getVideoDurationInMillis(this, quality);
+ CameraSettings.getVideoDurationInMillis(this, quality, mCameraId);
}
// Read time lapse recording interval.