From 9fff0f154b8531094aa1349e0241a998c14da810 Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Thu, 5 May 2011 15:37:25 +0800
Subject: 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
---
 src/com/android/camera/VideoCamera.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com/android/camera/VideoCamera.java')

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.
-- 
cgit v1.1