Reorder actions on stopCapturer, to avoid crashing on camera timeout.

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

Index: webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
index 6515c07f3c4a7d38831930d8e49c1e4aa1559847..20d4f210969772df7e7e89fca2f494486497f80f 100644
--- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
+++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
@@ -372,12 +372,7 @@ public class VideoCapturerAndroid implements
     }
     Logging.e(TAG, "startCapture failed", error);
     // Make sure the camera is released.
-    stopCaptureOnCameraThread();
-    synchronized (handlerLock) {
-      // Remove all pending Runnables posted from |this|.
-      cameraThreadHandler.removeCallbacksAndMessages(this /* token */);
-      cameraThreadHandler = null;
-    }
+    stopCaptureOnCameraThread(true /* stopHandler */);
     frameObserver.onCapturerStarted(false);
     if (eventsHandler != null) {
       eventsHandler.onCameraError("Camera can not be started.");
@@ -483,13 +478,7 @@ public class VideoCapturerAndroid implements
     final CountDownLatch barrier = new CountDownLatch(1);
     final boolean didPost = maybePostOnCameraThread(new Runnable() {
       @Override public void run() {
-        stopCaptureOnCameraThread();
-        synchronized (handlerLock) {
-          // Remove all pending Runnables posted from |this|.
-          cameraThreadHandler.removeCallbacksAndMessages(this /* token */);
-          cameraThreadHandler = null;
-          surfaceHelper = null;
-        }
+        stopCaptureOnCameraThread(true /* stopHandler */);
         barrier.countDown();
       }
     });
@@ -507,7 +496,7 @@ public class VideoCapturerAndroid implements
     Logging.d(TAG, "stopCapture done");
   }
 
-  private void stopCaptureOnCameraThread() {
+  private void stopCaptureOnCameraThread(boolean stopHandler) {
     checkIsOnCameraThread();
     Logging.d(TAG, "stopCaptureOnCameraThread");
     // Note that the camera might still not be started here if startCaptureOnCameraThread failed
@@ -517,6 +506,21 @@ public class VideoCapturerAndroid implements
     if (surfaceHelper != null) {
       surfaceHelper.stopListening();
     }
+    if (stopHandler) {
+      synchronized (handlerLock) {
+        // Clear the cameraThreadHandler first, in case stopPreview or
+        // other driver code deadlocks. Deadlock in
+        // android.hardware.Camera._stopPreview(Native Method) has
+        // been observed on Nexus 5 (hammerhead), OS version LMY48I.
+        // The camera might post another one or two preview frames
+        // before stopped, so we have to check for a null
+        // cameraThreadHandler in our handler. Remove all pending
+        // Runnables posted from |this|.
+        cameraThreadHandler.removeCallbacksAndMessages(this /* token */);
+        cameraThreadHandler = null;
+        surfaceHelper = null;
+      }
+    }
     if (cameraStatistics != null) {
       cameraStatistics.release();
       cameraStatistics = null;
@@ -543,7 +547,7 @@ public class VideoCapturerAndroid implements
   private void switchCameraOnCameraThread() {
     checkIsOnCameraThread();
     Logging.d(TAG, "switchCameraOnCameraThread");
-    stopCaptureOnCameraThread();
+    stopCaptureOnCameraThread(false /* stopHandler */);
     synchronized (cameraIdLock) {
       id = (id + 1) % android.hardware.Camera.getNumberOfCameras();
     }
@@ -632,9 +636,7 @@ public class VideoCapturerAndroid implements
   @Override
   public void onTextureFrameAvailable(
       int oesTextureId, float[] transformMatrix, long timestampNs) {
-    if (cameraThreadHandler == null) {
-      throw new RuntimeException("onTextureFrameAvailable() called after stopCapture().");
-    }
+
     checkIsOnCameraThread();
     if (eventsHandler != null && !firstFrameReported) {
       eventsHandler.onFirstFrameAvailable();