summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureModule.java
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2014-10-24 11:26:25 +0300
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:22:26 -0700
commit22ca2c39e37e0efd2a20417e25c3e0495ac5432e (patch)
treeb3095e468450f26b70c665bc75f48ab753dc34b7 /src/com/android/camera/CaptureModule.java
parent482ad154c89278b963e5eb6c537347129ef6af8b (diff)
downloadandroid_packages_apps_Snap-22ca2c39e37e0efd2a20417e25c3e0495ac5432e.tar.gz
android_packages_apps_Snap-22ca2c39e37e0efd2a20417e25c3e0495ac5432e.tar.bz2
android_packages_apps_Snap-22ca2c39e37e0efd2a20417e25c3e0495ac5432e.zip
Camera2: Remove CAF video duration code
Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rw-r--r--src/com/android/camera/CaptureModule.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 45b47e2d1..6bd333e1e 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2303,6 +2303,10 @@ public class CaptureModule implements CameraModule, PhotoController,
private void updateMaxVideoDuration() {
String minutesStr = mSettingsManager.getValue(SettingsManager.KEY_VIDEO_DURATION);
+ if (minutesStr == null) {
+ mMaxVideoDurationInMs = 0;
+ return;
+ }
int minutes = Integer.parseInt(minutesStr);
if (minutes == -1) {
// User wants lowest, set 30s */