From dec671d22aba0a2dc78eac022e66fb4adf99af4c Mon Sep 17 00:00:00 2001 From: mingwax Date: Fri, 20 Jan 2017 16:18:04 +0800 Subject: 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 --- src/com/android/camera/VideoMenu.java | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) mode change 100755 => 100644 src/com/android/camera/VideoMenu.java (limited to 'src/com/android/camera/VideoMenu.java') diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java old mode 100755 new mode 100644 index f5c432a19..ea4415fe6 --- 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); + } } } -- cgit v1.2.3