Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / video_capture / android / java / src / org / webrtc / videoengine / VideoCaptureAndroid.java

diff --git a/src/third_party/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java b/src/third_party/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
index 9bbe8ab..691531f 100644 (file)
--- a/src/third_party/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
+++ b/src/third_party/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;