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"

Browse Source 
am: 68ddb3afdb

Change-Id: I55006fe0d94a6a80574437c7b4a55c261013a2bf
This commit is contained in:
LuK1337
2019-10-29 23:49:58 -07:00
committed by android-build-merger
parent 447674e100 68ddb3afdb
commit 748ee1657f
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);
}