From e250645ea44b3eda975417d5128cc93b31aa3065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ing=2E=20Jan=20Kal=C3=A1b?= <pitlicek@gmail.com>
Date: Mon, 16 Jul 2018 13:50:32 +0200
Subject: [PATCH] Call callback in IDLE state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In current state, if you want to do something with the capturer (eg. switch to next camera again) it fails with an exception that camera switch is already in progress.

Change-Id: I908eb590b54fdf3346441097b39f1f2a2eb56ce8

Bug: webrtc:9527
Change-Id: I908eb590b54fdf3346441097b39f1f2a2eb56ce8
Reviewed-on: https://webrtc-review.googlesource.com/88700
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23995}
---
 AUTHORS                                             | 1 +
 sdk/android/src/java/org/webrtc/CameraCapturer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 2b09878b08..af1688f035 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,6 +24,7 @@ Gustavo Garcia <gustavogb@gmail.com>
 Hugues Ekra <hekra01@gmail.com>
 Jake Hilton <jakehilton@gmail.com>
 James H. Brown <jbrown@burgoyne.com>
+Jan Kalab <pitlicek@gmail.com>
 Jens Nielsen <jens.nielsen@berotec.se>
 Jiawei Ou <jiawei.ou@gmail.com>
 Jie Mao <maojie0924@gmail.com>
diff --git a/sdk/android/src/java/org/webrtc/CameraCapturer.java b/sdk/android/src/java/org/webrtc/CameraCapturer.java
index b9e22f18b0..08c6c6b0d5 100644
--- a/sdk/android/src/java/org/webrtc/CameraCapturer.java
+++ b/sdk/android/src/java/org/webrtc/CameraCapturer.java
@@ -50,11 +50,11 @@ abstract class CameraCapturer implements CameraVideoCapturer {
             stateLock.notifyAll();
 
             if (switchState == SwitchState.IN_PROGRESS) {
+              switchState = SwitchState.IDLE;
               if (switchEventsHandler != null) {
                 switchEventsHandler.onCameraSwitchDone(cameraEnumerator.isFrontFacing(cameraName));
                 switchEventsHandler = null;
               }
-              switchState = SwitchState.IDLE;
             } else if (switchState == SwitchState.PENDING) {
               switchState = SwitchState.IDLE;
               switchCameraInternal(switchEventsHandler);