commit 442ade89e1f281767715609f60d162475500d6fe
author Camera Software Integration <camswint@localhost> Tue Feb 28 04:42:34 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Feb 28 04:42:34 2017 -0800
tree bb32cf816d6a530c2c83eaf3090f4f8c2c044fb1
parent d27f3e0dc7420033d5a4b360b271516493862cb4
parent 7b7247768e2c4c891329d60e965bbbc4853700d0

Merge "napdragonCamera: Fix crash when swith to fisheye" into camera.lnx.1.0-dev.1.0

src/com/android/camera/VideoMenu.java

diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
old mode 100644
new mode 100755
index 825c95d..472630b
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -777,21 +777,25 @@
                 .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);
         }
 
     }