Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 900cc96b authored by LuK1337's avatar LuK1337 Committed by android-build-merger
Browse files

Merge "Settings: Fix QrCamera crash on devices without flash" am: 68ddb3af am: 748ee165 

am: 9a070555

Change-Id: Ia93df2d63161923aa0563159f86d6238ea1f27d7
parents 3f2aed49 9a070555

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

+3 −1
Original line number Diff line number Diff line
@@ -181,7 +181,9 @@ public class QrCamera extends Handler { 
        Size pictureSize = getBestPictureSize(mParameters);

        mParameters.setPictureSize(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);

        }