commit 8622eafc49c783c919946287145ec6f7400d73da
author Alexander Martinz <amartinz@shiftphones.com> Thu Sep 10 20:13:48 2020 +0200
committer Alexander Martinz <amartinz@shiftphones.com> Wed Jun 23 11:05:07 2021 +0200
tree cd8f812890fd497712e7e654ccb23e5f1698dba8
parent 118b59a1301aa2998af6de258f23787c1ca15554

SettingsManager: clean up constructor

Change-Id: I1349490f489968a3e46027f0cc8099844d310b64
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>

src/com/android/camera/SettingsManager.java

diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 805eb7c..aa9025c 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -286,32 +286,45 @@
             String[] cameraIdList = manager.getCameraIdList();
             boolean isFirstBackCameraId = true;
             for (int i = 0; i < cameraIdList.length; i++) {
-                String cameraId = cameraIdList[i];
-                CameraCharacteristics characteristics
-                        = manager.getCameraCharacteristics(cameraId);
-                Log.d(TAG,"cameraIdList size ="+cameraIdList.length);
+                final String cameraId = cameraIdList[i];
+                Log.d(TAG,"cameraIdList size = " + cameraIdList.length);
+
+                final CameraCharacteristics characteristics;
+                try {
+                    characteristics = manager.getCameraCharacteristics(cameraId);
+                } catch (Exception exc) {
+                    Log.w(TAG, "Could not obtain camera characteristics for cameraId: " + cameraId + ", skipping", exc);
+                    continue;
+                }
+
                 byte monoOnly = 0;
                 try {
                     monoOnly = characteristics.get(CaptureModule.MetaDataMonoOnlyKey);
-                }catch(Exception e) {
+                } catch(Exception ignored) {
+                    // ignored
                 }
                 if (monoOnly == 1) {
                     CaptureModule.MONO_ID = i;
                     mIsMonoCameraPresent = true;
                 }
-                int facing = characteristics.get(CameraCharacteristics.LENS_FACING);
-                if (facing == CameraCharacteristics.LENS_FACING_FRONT) {
+                int facing = 0;
+                try {
+                    facing = characteristics.get(CameraCharacteristics.LENS_FACING);
+                } catch (Exception ignored) {
+                    // ignored
+                }
+                if (facing == CameraMetadata.LENS_FACING_FRONT) {
                     CaptureModule.FRONT_ID = i;
                     mIsFrontCameraPresent = true;
-                } else if (facing == CameraCharacteristics.LENS_FACING_BACK &&
-                        isFirstBackCameraId) {
+                } else if (facing == CameraMetadata.LENS_FACING_BACK && isFirstBackCameraId) {
                     isFirstBackCameraId = false;
                     upgradeCameraId(mPreferences.getGlobal(), i);
                 }
+
                 mCharacteristics.add(i, characteristics);
             }
         } catch (CameraAccessException e) {
-            e.printStackTrace();
+            Log.e(TAG, "Could not properly initialize SettingsManager", e);
         }
 
         mDependency = parseJson("dependency.json");