Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2019-12-19 14:01:24 +03:00
parent b8e0898c7c 9564aa1fdb
commit 4c86fc13cb
16 changed files with 559 additions and 77 deletions
@@ -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 {