Merge ppull request #258 from asmorkalov/android_emu_fix

efecf3b8 · Andrey Kamaev · 8cf6bcb2 · 9ca65cee · efecf3b8
Commit efecf3b8 authored Dec 24, 2012 by Andrey Kamaev
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

android+JavaCameraView.java modules/java/generator/src/java/android+JavaCameraView.java +1 -1

No files found.
--- a/modules/java/generator/src/java/android+JavaCameraView.java
+++ b/modules/java/generator/src/java/android+JavaCameraView.java
@@ -124,7 +124,7 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
                    params.setPreviewSize((int)frameSize.width, (int)frameSize.height);
                    List<String> FocusModes = params.getSupportedFocusModes();
-                    if (FocusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO))
+                    if (FocusModes != null && FocusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO))
                    {
                        params.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
                    }