Merge "Settings: Fix QrCamera crash on devices without flash" am: 68d…

…db3a am: 748ee16 Change-Id: Ic64d2c3a36939751891440639b5114a9df3fd184
2by2-Project · Oct 30, 2019 · 9a07055 · 9a07055
2 parents 54ef0fc + 748ee16
commit 9a07055
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java
@@ -178,7 +178,9 @@ private void setCameraParameter() {
         Size pictureSize = getBestPictureSize(mParameters);
         mParameters.setPreviewSize(pictureSize.getWidth(), pictureSize.getHeight());
 
-        if (mParameters.getSupportedFlashModes().contains(Parameters.FLASH_MODE_OFF)) {
+        final List<String> supportedFlashModes = mParameters.getSupportedFlashModes();
+        if (supportedFlashModes != null &&
+                supportedFlashModes.contains(Parameters.FLASH_MODE_OFF)) {
             mParameters.setFlashMode(Parameters.FLASH_MODE_OFF);
         }