SnapdragonCamera: Handle cam switch icon if numOfCams less than 2

While generalizing SnapdragonCamera app for any number of cameras we
have to handle a special case if number of camera's are less than 2.
If there is only 1 camera in the app then there is no camera switch
option and hence the corresponding switch icon object is null

Change-Id: I672708bb98a30054adaf916bb272b50cdd8d0091

1 files changed, 8 insertions, 4 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 8cb372f5e..04aa1fb8f 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -534,6 +534,14 @@ public class VideoModule implements CameraModule,
 
         Log.e(TAG,"loadCameraPreferences() updating camera_id pref");
 
+        IconListPreference switchIconPref =
+                (IconListPreference)mPreferenceGroup.findPreference(
+                CameraSettings.KEY_CAMERA_ID);
+
+        //if numOfCams < 2 then switchIconPref will be null as there is no switch icon in this case
+        if (switchIconPref == null)
+            return;
+
         int[] iconIds = new int[numOfCams];
         String[] entries = new String[numOfCams];
         String[] labels = new String[numOfCams];
@@ -554,10 +562,6 @@ public class VideoModule implements CameraModule,
             }
         }
 
-        IconListPreference switchIconPref =
-                (IconListPreference)mPreferenceGroup.findPreference(
-                CameraSettings.KEY_CAMERA_ID);
-
         switchIconPref.setIconIds(iconIds);
         switchIconPref.setEntries(entries);
         switchIconPref.setLabels(labels);