commit 35564065ca6d5d2513fb89af6e048e07cf57b003
author sakal <sakal@webrtc.org> Fri Jan 20 11:09:03 2017
committer Commit bot <commit-bot@chromium.org> Fri Jan 20 11:09:03 2017
tree 15d657f49db1c9163f9e730cce96bba4d284e303
parent 9e30274c03c8e812abeb37c7876648e3cae0805a

Camera1Session: Fix camera sometimes getting stopped twice.

Moves setting state as stopped to stopInternal. Checks that state is not
stopped in stopInternal.

BUG=webrtc:7015

Review-Url: https://codereview.webrtc.org/2640093003
Cr-Commit-Position: refs/heads/master@{#16182}

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

diff --git a/webrtc/sdk/android/api/org/webrtc/Camera1Session.java b/webrtc/sdk/android/api/org/webrtc/Camera1Session.java
index 8d81d2d..8f1c15d 100644
--- a/webrtc/sdk/android/api/org/webrtc/Camera1Session.java
+++ b/webrtc/sdk/android/api/org/webrtc/Camera1Session.java
@@ -177,7 +177,6 @@
     checkIsOnCameraThread();
     if (state != SessionState.STOPPED) {
       final long stopStartTime = System.nanoTime();
-      state = SessionState.STOPPED;
       stopInternal();
       final int stopTimeMs = (int) TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - stopStartTime);
       camera1StopTimeMsHistogram.addSample(stopTimeMs);
@@ -200,7 +199,6 @@
           errorMessage = "Camera error: " + error;
         }
         Logging.e(TAG, errorMessage);
-        state = SessionState.STOPPED;
         stopInternal();
         if (error == android.hardware.Camera.CAMERA_ERROR_EVICTED) {
           events.onCameraDisconnected(Camera1Session.this);
@@ -218,7 +216,6 @@
     try {
       camera.startPreview();
     } catch (RuntimeException e) {
-      state = SessionState.STOPPED;
       stopInternal();
       events.onCameraError(this, e.getMessage());
     }
@@ -227,16 +224,19 @@
   private void stopInternal() {
     Logging.d(TAG, "Stop internal");
     checkIsOnCameraThread();
+    if (state == SessionState.STOPPED) {
+      Logging.d(TAG, "Camera is already stopped");
+      return;
+    }
 
+    state = SessionState.STOPPED;
     surfaceTextureHelper.stopListening();
-
     // Note: stopPreview or other driver code might deadlock. Deadlock in
     // android.hardware.Camera._stopPreview(Native Method) has been observed on
     // Nexus 5 (hammerhead), OS version LMY48I.
     camera.stopPreview();
     camera.release();
     events.onCameraClosed(this);
-
     Logging.d(TAG, "Stop done");
   }