PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 748ee1657f

Change-Id: Ic64d2c3a36939751891440639b5114a9df3fd184
This commit is contained in:
LuK1337
2019-10-29 23:56:00 -07:00
committed by android-build-merger
parent 54ef0fcbc0 748ee1657f
commit 9a07055546
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/qrcode/QrCamera.java
View File

@@ -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<String> supportedFlashModes = mParameters.getSupportedFlashModes();
if (supportedFlashModes != null &&
supportedFlashModes.contains(Parameters.FLASH_MODE_OFF)) {
mParameters.setFlashMode(Parameters.FLASH_MODE_OFF);
}