commit f5f2674933300946869f1939e001c3d82eb910c2
author Linux Build Service Account <lnxbuild@localhost> Wed Nov 18 12:54:27 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 18 12:54:27 2015 -0800
tree 39f741ef911f6de6b7486eaf51cda24c713ef47f
parent aedf855f64b4a9f88dfcb31a18d47757d780e3fa
parent ad35e3b39d897946be9e239c7de394a4b35f4e36

Merge "SnapdragonCamera: Handle cam switch icon if numOfCams less than 2"

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 03235cc..f709174 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1866,6 +1866,14 @@
 
         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];
@@ -1886,10 +1894,6 @@
             }
         }
 
-        IconListPreference switchIconPref =
-                (IconListPreference)mPreferenceGroup.findPreference(
-                CameraSettings.KEY_CAMERA_ID);
-
         switchIconPref.setIconIds(iconIds);
         switchIconPref.setEntries(entries);
         switchIconPref.setLabels(labels);

src/com/android/camera/VideoModule.java

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 8cb372f..04aa1fb 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -534,6 +534,14 @@
 
         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 @@
             }
         }
 
-        IconListPreference switchIconPref =
-                (IconListPreference)mPreferenceGroup.findPreference(
-                CameraSettings.KEY_CAMERA_ID);
-
         switchIconPref.setIconIds(iconIds);
         switchIconPref.setEntries(entries);
         switchIconPref.setLabels(labels);