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

channeladam · Dec 19, 2019 · 9cd1d08 · 9cd1d08
1 parent 5d15c65
commit 9cd1d08
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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 void onConfigureFailed(CameraCaptureSession cameraCaptureSession) {
 
     @Override
     protected void disconnectCamera() {
-        Log.i(LOGTAG, "closeCamera");
+        Log.i(LOGTAG, "close camera");
         try {
             CameraDevice c = mCameraDevice;
             mCameraDevice = null;
@@ -241,13 +241,14 @@ protected void disconnectCamera() {
             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 {