diff options
| author | mingwax <mingwax@codeaurora.org> | 2017-01-20 16:18:04 +0800 |
|---|---|---|
| committer | mingwax <mingwax@codeaurora.org> | 2017-01-20 16:24:20 +0800 |
| commit | dec671d22aba0a2dc78eac022e66fb4adf99af4c (patch) | |
| tree | e25933ce98da9802a86c45a4fe631b37da6830de /src/com/android/camera/VideoMenu.java | |
| parent | 36f2a32a9277b09badec5a16d7f6b8c9b581015e (diff) | |
| download | android_packages_apps_Snap-dec671d22aba0a2dc78eac022e66fb4adf99af4c.tar.gz android_packages_apps_Snap-dec671d22aba0a2dc78eac022e66fb4adf99af4c.tar.bz2 android_packages_apps_Snap-dec671d22aba0a2dc78eac022e66fb4adf99af4c.zip | |
SnapdragonCamera: Fix FC does`t support Video high frame rate
When the phone does`t support KEY_VIDEO_HIGH_FRAME_RATE, add
judgment is not null pointer of condition.
CRs-Fixed: 1112739
Change-Id: Ie3b860a96b4ae41c6c4669aab24a86974be61960
Diffstat (limited to 'src/com/android/camera/VideoMenu.java')
| -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); + } } } |