wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1042689 - Deal with a native stopCapture if the camera is paused. r=jesup

Browse Source
This commit is contained in:
Gian-Carlo Pascutto 2014-08-04 08:29:45 +02:00
parent e6440c8710
commit 2b1a58480d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
View File

@ -224,6 +224,12 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback, AppStateL
private synchronized boolean stopCapture() {
Log.d(TAG, "stopCapture");
if (camera == null) {
if (mResumeCapture == true) {
// We already got onPause, but now the native code wants us to stop.
// Do not resume capturing when resuming the app.
mResumeCapture = false;
return true;
}
throw new RuntimeException("Camera is already stopped!");
}
Throwable error = null;