From 92068ee6838b20cc204c5604f5f61c0253f1ff52 Mon Sep 17 00:00:00 2001
From: colin <colin@comoyo.com>
Date: Fri, 11 Sep 2015 06:30:32 -0700
Subject: [PATCH] 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                                                     | 1 +
 .../java/android/org/webrtc/VideoCapturerAndroid.java       | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5ffa000599..2398b88b44 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,5 +40,6 @@ MIPS Technologies
 Mozilla Foundation
 Opera Software ASA
 struktur AG
+Telenor Digital AS
 Temasys Communications
 Vonage Holdings Corp.
diff --git a/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java b/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
index aeb5418f75..5962e5585b 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 @@ public class VideoCapturerAndroid extends VideoCapturer implements PreviewCallba
     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