summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoMenu.java
diff options
context:
space:
mode:
authorweijiew <weijiew@codeaurora.org>2017-03-17 15:04:06 +0800
committerWeijie Wang <weijiew@codeaurora.org>2017-08-29 14:48:48 +0800
commit21a4a7c612e47af9f06550976b74aa984f5a6b69 (patch)
tree42d6c38c057d2eda70bf437b45b841514ffda293 /src/com/android/camera/VideoMenu.java
parenta5eb667e4f654501063ade99f2ce7ededed1515a (diff)
downloadandroid_packages_apps_Snap-21a4a7c612e47af9f06550976b74aa984f5a6b69.tar.gz
android_packages_apps_Snap-21a4a7c612e47af9f06550976b74aa984f5a6b69.tar.bz2
android_packages_apps_Snap-21a4a7c612e47af9f06550976b74aa984f5a6b69.zip
SnapdragonCamera: Wrapper for QC API
1. Wrapper for Parameters 2. Wrapper for CameraInfo 3. Wrapper for CamcorderProfile 4. Wrapper for Camera 5. Wrapper for ExtendedFace Change-Id: I8c8605db3696bffc4d975c0bb6f74944ed23a6bd
Diffstat (limited to 'src/com/android/camera/VideoMenu.java')
-rw-r--r--[-rwxr-xr-x]src/com/android/camera/VideoMenu.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 472630b3c..ca6aa0687 100755..100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -769,7 +769,7 @@ public class VideoMenu extends MenuController
.findPreference(CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL);
ListPreference videoHDRPref = mPreferenceGroup
.findPreference(CameraSettings.KEY_VIDEO_HDR);
- String disMode = disPref.getValue();
+ String disMode = disPref == null ? "disable" : disPref.getValue();
String videoHDR = videoHDRPref == null ? "off" : videoHDRPref.getValue();
String frameIntervalStr = frameIntervalPref.getValue();
int timeLapseInterval = Integer.parseInt(frameIntervalStr);