diff options
| author | Camera Software Integration <camswint@localhost> | 2017-02-28 04:42:34 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-28 04:42:34 -0800 |
| commit | 442ade89e1f281767715609f60d162475500d6fe (patch) | |
| tree | bb32cf816d6a530c2c83eaf3090f4f8c2c044fb1 /src/com/android/camera/VideoMenu.java | |
| parent | d27f3e0dc7420033d5a4b360b271516493862cb4 (diff) | |
| parent | 7b7247768e2c4c891329d60e965bbbc4853700d0 (diff) | |
| download | android_packages_apps_Snap-442ade89e1f281767715609f60d162475500d6fe.tar.gz android_packages_apps_Snap-442ade89e1f281767715609f60d162475500d6fe.tar.bz2 android_packages_apps_Snap-442ade89e1f281767715609f60d162475500d6fe.zip | |
Merge "napdragonCamera: Fix crash when swith to fisheye" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/VideoMenu.java')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/VideoMenu.java | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 825c95df1..472630b3c 100644..100755 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -777,21 +777,25 @@ public class VideoMenu extends MenuController .getInt("persist.camcorder.eis.maxfps", 30); ListPreference hfrPref = mPreferenceGroup .findPreference(CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE); - if (hfrPref != null) { - String highFrameRate = hfrPref.getValue(); - boolean isHFR = "hfr".equals(highFrameRate.substring(0,3)); - boolean isHSR = "hsr".equals(highFrameRate.substring(0,3)); - int rate = 0; - if ( isHFR || isHSR ) { - String hfrRate = highFrameRate.substring(3); - rate = Integer.parseInt(hfrRate); - } + String highFrameRate; + if (hfrPref == null) { + //If hfrPref is null, use whitespace instead. + highFrameRate = " "; + } else { + highFrameRate = hfrPref.getValue(); + } + boolean isHFR = "hfr".equals(highFrameRate.substring(0,3)); + boolean isHSR = "hsr".equals(highFrameRate.substring(0,3)); + int rate = 0; + if ( isHFR || isHSR ) { + String hfrRate = highFrameRate.substring(3); + rate = Integer.parseInt(hfrRate); + } - if ((disMode.equals("enable") && rate > PERSIST_EIS_MAX_FPS) - || !videoHDR.equals("off") - || timeLapseInterval != 0) { - mListMenu.setPreferenceEnabled(CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, false); - } + if ((disMode.equals("enable") && rate > PERSIST_EIS_MAX_FPS) + || !videoHDR.equals("off") + || timeLapseInterval != 0) { + mListMenu.setPreferenceEnabled(CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, false); } } |