Skip to content

Commit 8b983c9

Browse files
authored
Merge pull request #80 from Morion-Self/master
Fix crash If device is not supported flash mode setting.
2 parents 7d6b369 + bb1239b commit 8b983c9

File tree

1 file changed

+7
-5
lines changed
  • visionSamples/barcode-reader/app/src/main/java/com/google/android/gms/samples/vision/barcodereader/ui/camera

1 file changed

+7
-5
lines changed

visionSamples/barcode-reader/app/src/main/java/com/google/android/gms/samples/vision/barcodereader/ui/camera/CameraSource.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -785,11 +785,13 @@ private Camera createCamera() {
785785
mFocusMode = parameters.getFocusMode();
786786

787787
if (mFlashMode != null) {
788-
if (parameters.getSupportedFlashModes().contains(
789-
mFlashMode)) {
790-
parameters.setFlashMode(mFlashMode);
791-
} else {
792-
Log.i(TAG, "Camera flash mode: " + mFlashMode + " is not supported on this device.");
788+
if (parameters.getSupportedFlashModes() != null) {
789+
if (parameters.getSupportedFlashModes().contains(
790+
mFlashMode)) {
791+
parameters.setFlashMode(mFlashMode);
792+
} else {
793+
Log.i(TAG, "Camera flash mode: " + mFlashMode + " is not supported on this device.");
794+
}
793795
}
794796
}
795797

0 commit comments

Comments
 (0)