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
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:37 +0200
commit9cc26c0d16af16f17a0d6fdc3b1b549de521a72b (patch)
tree55c48d7782b9e9769df69d246ff75a25d78a337e /src/com/android/camera/CaptureModule.java
parent63eff37ff2486a80ce052800cec6ce98c4cd6d09 (diff)
downloadandroid_packages_apps_Snap-9cc26c0d16af16f17a0d6fdc3b1b549de521a72b.tar.gz
android_packages_apps_Snap-9cc26c0d16af16f17a0d6fdc3b1b549de521a72b.tar.bz2
android_packages_apps_Snap-9cc26c0d16af16f17a0d6fdc3b1b549de521a72b.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 32d360cd9..6084a84ed 100755
--- 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 */