From 9506e12eba15c18b013cd9f6c28aba10ad5ace63 Mon Sep 17 00:00:00 2001
From: hankzhang8945 <hankzhang8945@gmail.com>
Date: Tue, 17 Jan 2017 01:29:19 -0800
Subject: [PATCH] Reset pendingCameraSwitch as false after failed to post
 switchCameraOnThread to camera thread.

BUG=webrtc:6981

Review-Url: https://codereview.webrtc.org/2625133007
Cr-Commit-Position: refs/heads/master@{#16105}
---
 .../sdk/android/api/org/webrtc/VideoCapturerAndroid.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java b/webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java
index 45a5fcbda3..d002925215 100644
--- a/webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java
+++ b/webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java
@@ -184,8 +184,13 @@ public class VideoCapturerAndroid
         }
       }
     });
-    if (!didPost && switchEventsHandler != null) {
-      switchEventsHandler.onCameraSwitchError("Camera is stopped.");
+    if (!didPost) {
+      synchronized (pendingCameraSwitchLock) {
+        pendingCameraSwitch = false;
+      }
+      if (switchEventsHandler != null) {
+        switchEventsHandler.onCameraSwitchError("Camera is stopped.");
+      }
     }
   }