diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-30 16:22:42 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-30 16:22:42 -0800 |
| commit | 7ba92496e19033b068849ad7fdc4b944e6c8e57b (patch) | |
| tree | 080f38ac71b372559e920ad225f4996f073cc012 /src | |
| parent | 4c1defd3037dad86c0fb2fd7717813eee920f00e (diff) | |
| parent | dec671d22aba0a2dc78eac022e66fb4adf99af4c (diff) | |
| download | android_packages_apps_Snap-7ba92496e19033b068849ad7fdc4b944e6c8e57b.tar.gz android_packages_apps_Snap-7ba92496e19033b068849ad7fdc4b944e6c8e57b.tar.bz2 android_packages_apps_Snap-7ba92496e19033b068849ad7fdc4b944e6c8e57b.zip | |
Merge "SnapdragonCamera: Fix FC does`t support Video high frame rate" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
| -rw-r--r--[-rwxr-xr-x] | src/com/android/camera/VideoMenu.java | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index f5c432a19..ea4415fe6 100755..100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -776,19 +776,21 @@ public class VideoMenu extends MenuController .getInt("persist.camcorder.eis.maxfps", 30); ListPreference hfrPref = mPreferenceGroup .findPreference(CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE); - 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); - } + 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); + } - 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); + } } } |