From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Thu, 19 Dec 2019 00:29:53 +0000 (+0000)
Subject: android(camera2): apply .disconnectCamera() patch from issue 13574
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~3^2~3^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9cd1d087c38dfa41d4606b53a40496871ae4e875;p=platform%2Fupstream%2Fopencv.git

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

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
index 09e01b0..5eac339 100644
--- 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 {