commit 9506e12eba15c18b013cd9f6c28aba10ad5ace63
author hankzhang8945 <hankzhang8945@gmail.com> Tue Jan 17 09:29:19 2017
committer Commit bot <commit-bot@chromium.org> Tue Jan 17 09:29:19 2017
tree fbd1ca0c484cba578d1ff54984996b189c5bf138
parent f4caaab5189d6040039a61a2741ec4d92a62e75b

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}

webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java

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