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
committerArne Coucheron <arco68@gmail.com>2018-01-26 00:51:35 +0100
commitfd8d27a39153ee8c8ee976a69012b75bd7f0b226 (patch)
treea4e025d06ff5f79344a3235cc91c2b3d58a431b7 /src/com/android/camera/CaptureModule.java
parent4ea21085005bf2424ed8ad7a0b021df9906b8cc2 (diff)
downloadandroid_packages_apps_Snap-fd8d27a39153ee8c8ee976a69012b75bd7f0b226.tar.gz
android_packages_apps_Snap-fd8d27a39153ee8c8ee976a69012b75bd7f0b226.tar.bz2
android_packages_apps_Snap-fd8d27a39153ee8c8ee976a69012b75bd7f0b226.zip
Camera2: Remove CAF video duration code
Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rwxr-xr-xsrc/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 4765b9aee..506c323a7 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3185,6 +3185,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 */