commit 92068ee6838b20cc204c5604f5f61c0253f1ff52
author colin <colin@comoyo.com> Fri Sep 11 06:30:32 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Sep 11 13:30:37 2015 +0000
tree 5c4a8aa3458c2d07861c890f76d16863cc655d62
parent c68700f717cf582b3af19f7a48ccf989a9b56d3d

Android: Guard against switching camera on stopped camera

It is possible that cameraThreadHandler is null upon calling
switchCamera(). This CL adds a guard against that.

Review URL: https://codereview.webrtc.org/1325333003

Cr-Commit-Position: refs/heads/master@{#9925}

AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 5ffa000..2398b88 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,5 +40,6 @@
 Mozilla Foundation
 Opera Software ASA
 struktur AG
+Telenor Digital AS
 Temasys Communications
 Vonage Holdings Corp.

talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java

diff --git a/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java b/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
index aeb5418..5962e55 100644
--- a/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
+++ b/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
@@ -168,9 +168,9 @@
     if (Camera.getNumberOfCameras() < 2 )
       return false;
 
-    if (cameraThread == null) {
-      Log.e(TAG, "Camera has not been started");
-      return false;
+    if (cameraThreadHandler == null) {
+        Log.e(TAG, "Calling switchCamera() for stopped camera.");
+        return false;
     }
     if (pendingCameraSwitch) {
       // Do not handle multiple camera switch request to avoid blocking