commit b056ea70f013d4f117af019874e89e40326e4782
author LuK1337 <priv.luk@gmail.com> Sat Oct 12 11:59:09 2019 +0200
committer Tsung-Mao Fang <tmfang@google.com> Wed Oct 30 02:45:08 2019 +0000
tree 90eb9de32abd047c8bdec9a11961fff184207c29
parent 0e40f46fe22cf58e96d791cc2c7c109e5c50826d

Settings: Fix QrCamera crash on devices without flash

Change-Id: Ife34b5fb87a9a4f509b665a3433e0b2ba857c885

src/com/android/settings/wifi/qrcode/QrCamera.java

diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java
index c682587..00f0348 100644
--- a/src/com/android/settings/wifi/qrcode/QrCamera.java
+++ b/src/com/android/settings/wifi/qrcode/QrCamera.java
@@ -178,7 +178,9 @@
         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);
         }