From 932b0193e7a143ecf3900a368492c93f6e1f60de Mon Sep 17 00:00:00 2001
From: "fischman@webrtc.org"
 <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 27 Jan 2014 22:32:05 +0000
Subject: [PATCH] VideoCaptureAndroid: stop preview in opposite order of
 starting.

While the SDK documentation doesn't prescribe a required shutdown order, good
hygiene suggests stopping should happen in reverse order of starting.  It also
seems to relieve a crash in the system capturer on at least the Galaxy Note 10.

BUG=2793
R=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/7549004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5445 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../java/src/org/webrtc/videoengine/VideoCaptureAndroid.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java b/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
index 9bbe8ab374..691531f873 100644
--- a/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
+++ b/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
@@ -126,14 +126,14 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
     }
     Throwable error = null;
     try {
+      camera.stopPreview();
+      camera.setPreviewCallbackWithBuffer(null);
       if (localPreview != null) {
         localPreview.removeCallback(this);
         camera.setPreviewDisplay(null);
       } else {
         camera.setPreviewTexture(null);
       }
-      camera.setPreviewCallbackWithBuffer(null);
-      camera.stopPreview();
       camera.release();
       camera = null;
       return true;