Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[camera] Partially Address CameraAccessException: CAMERA_ERROR #5723

Merged
fluttergithubbot merged 13 commits into from
Jun 23, 2022
Merged

[camera] Partially Address CameraAccessException: CAMERA_ERROR #5723

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
231c5e0
Handle crash
camsim99 May 13, 2022
86efe0c
Attempt capture session close removal
camsim99 May 19, 2022
8f90972
Remove captureSession.close()
camsim99 May 19, 2022
bb17f48
Testing
camsim99 May 24, 2022
ad48733
Makde corrections
camsim99 May 25, 2022
9fbef6c
Undo unecessary changes, update changelog
camsim99 May 25, 2022
75edc94
Merge remote-tracking branch 'upstream/master' into issue_102644
camsim99 May 25, 2022
d31f647
Update pubspec
camsim99 May 25, 2022
33d2bd1
Add tests, edit changelog
camsim99 May 26, 2022
0cc5bd3
Merge remote-tracking branch 'upstream/master' into issue_102644
camsim99 May 26, 2022
0ead150
Add comment
camsim99 Jun 3, 2022
2db2eba
Merge remote-tracking branch 'upstream/main' into issue_102644
camsim99 Jun 22, 2022
afde5d9
Fix versioning
camsim99 Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Makde corrections
  • Loading branch information
@camsim99
camsim99 committed May 25, 2022
commit ad487334e5ef9ea37470144386d343e24af64df9
9 changes: 6 additions & 3 deletions packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ public void onDisconnected(@NonNull CameraDevice cameraDevice) {
@Override
public void onError(@NonNull CameraDevice cameraDevice, int errorCode) {
Log.i(TAG, "open | onError");

close();

String errorDescription;
Expand Down Expand Up @@ -394,7 +394,7 @@ private void createCaptureSession(
int templateType, Runnable onSuccessCallback, Surface... surfaces)
throws CameraAccessException {
// Close any existing capture session.
closeCaptureSession();
captureSession = null;
Copy link

@blasten blasten Jun 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is still necessary.

Creating a new capture session with CameraDevice#createCaptureSession will close any existing capture session automatically, and call the older session listener's StateCallback#onClosed callback.

This plugin is using https://developer.android.com/reference/android/hardware/camera2/CameraDevice#createCaptureRequest(int) instead.

Copy link
Contributor Author

@camsim99 camsim99 Jun 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CameraDevice#createCaptureSession is getting called further down in the method, see here. As you'll see, for API 27 and below, the deprecated version of CameraDevice#createCaptureSession is actually used (see here), but it too takes care of closing the old capture session because both ultimately call this method to close the session.

Copy link

@blasten blasten Jun 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Thank you


// Create a new capture builder.
previewRequestBuilder = cameraDevice.createCaptureRequest(templateType);
Expand Down Expand Up @@ -1181,12 +1181,15 @@ private void closeCaptureSession() {

public void close() {
Log.i(TAG, "close");
captureSession = null;

if (cameraDevice != null) {
cameraDevice.close();
cameraDevice = null;
captureSession = null;
} else {
closeCaptureSession();
}

if (pictureImageReader != null) {
pictureImageReader.close();
pictureImageReader = null;
Expand Down