From b056ea70f013d4f117af019874e89e40326e4782 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 12 Oct 2019 11:59:09 +0200 Subject: [PATCH] Settings: Fix QrCamera crash on devices without flash Change-Id: Ife34b5fb87a9a4f509b665a3433e0b2ba857c885 --- src/com/android/settings/wifi/qrcode/QrCamera.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java index c6825879558..00f034811b3 100644 --- a/src/com/android/settings/wifi/qrcode/QrCamera.java +++ b/src/com/android/settings/wifi/qrcode/QrCamera.java @@ -178,7 +178,9 @@ public class QrCamera extends Handler { Size pictureSize = getBestPictureSize(mParameters); mParameters.setPreviewSize(pictureSize.getWidth(), pictureSize.getHeight()); - if (mParameters.getSupportedFlashModes().contains(Parameters.FLASH_MODE_OFF)) { + final List supportedFlashModes = mParameters.getSupportedFlashModes(); + if (supportedFlashModes != null && + supportedFlashModes.contains(Parameters.FLASH_MODE_OFF)) { mParameters.setFlashMode(Parameters.FLASH_MODE_OFF); }