android(camera2): apply .disconnectCamera() patch from issue 13574

5 years ago · 9cd1d087c3
parent 5d15c65e48
commit 9cd1d087c3
1 changed files with 4 additions and 3 deletions
--- a/modules/java/generator/android-21/java/org/opencv/android/JavaCamera2View.java
+++ b/modules/java/generator/android-21/java/org/opencv/android/JavaCamera2View.java
@ -230,7 +230,7 @@ public class JavaCamera2View extends CameraBridgeViewBase {

    @Override
    protected void disconnectCamera() {
-        Log.i(LOGTAG, "closeCamera");
+        Log.i(LOGTAG, "close camera");
        try {
            CameraDevice c = mCameraDevice;
            mCameraDevice = null;
@ -241,13 +241,14 @@ public class JavaCamera2View extends CameraBridgeViewBase {
            if (null != c) {
                c.close();
            }
+        } finally {
+            stopBackgroundThread();
            if (null != mImageReader) {
                mImageReader.close();
                mImageReader = null;
            }
-        } finally {
-            stopBackgroundThread();
        }
+        Log.i(LOGTAG, "camera closed!");
    }

    public static class JavaCameraSizeAccessor implements ListItemAccessor {