Skip to content

[camera_android] Reset AE and AF triggers to idle after capture #11330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
q2a3z wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[camera_android] Reset AE and AF triggers to idle after capture #11330

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61b2ecd
[camera_android] Reset AE and AF triggers to idle after capture
q2a3z Mar 23, 2026
07abc0f
[camera_android] Implement trigger reset callback for AE and AF captu…
q2a3z Mar 27, 2026
daa1d07
Revert "[camera_android] Reset AE and AF triggers to idle after capture"
q2a3z Mar 27, 2026
24517fc
Merge branch 'main' into fix/Camera2-ae-af-reset
q2a3z Mar 27, 2026
40c44a9
Merge branch 'main' into fix/Camera2-ae-af-reset
q2a3z Apr 9, 2026
1105f8b
Bump version to 0.10.10+17 and update CHANGELOG with AE/AF reset and …
q2a3z Apr 9, 2026
2dbf24c
Consolidate changelog entries for clarity
q2a3z Apr 9, 2026
7c52113
Format code
q2a3z Apr 10, 2026
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
5 changes: 5 additions & 0 deletions packages/camera/camera_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.10.10+17

* Reset AE and AF triggers to idle after capture.
Copy link
Copy Markdown
Contributor

@camsim99 camsim99 Apr 9, 2026

Choose a reason for hiding this comment

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

We only add one line per change. Can you combine these? Maybe something like "Reset AE and AF triggers to idle after capture to fix camera flash remaining issue #97501." ?

Copy link
Copy Markdown
Author

@q2a3z q2a3z Apr 9, 2026

Choose a reason for hiding this comment

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

Sorry, I have combined it into one line.
2dbf24c

* Fix camera flash remaining issue #97501.

## 0.10.10+16

* Updates build files from Groovy to Kotlin.
Expand Down
35 changes: 33 additions & 2 deletions packages/camera/camera_android/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 @@ -12,6 +12,7 @@
import android.graphics.SurfaceTexture;
import android.hardware.camera2.CameraAccessException;
import android.hardware.camera2.CameraCaptureSession;
import android.hardware.camera2.CaptureFailure;
import android.hardware.camera2.CameraDevice;
import android.hardware.camera2.CameraManager;
import android.hardware.camera2.CameraMetadata;
Expand Down Expand Up @@ -675,13 +676,39 @@ private void runPrecaptureSequence() {

// Trigger one capture to start AE sequence.
captureSession.capture(
previewRequestBuilder.build(), cameraCaptureCallback, backgroundHandler);
previewRequestBuilder.build(),
createTriggerResetCallback(
CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_IDLE),
backgroundHandler);

} catch (CameraAccessException e) {
e.printStackTrace();
}
}

@VisibleForTesting
CameraCaptureSession.CaptureCallback createTriggerResetCallback(
final CaptureRequest.Key<Integer> triggerKey, final int triggerIdleValue) {
return new CameraCaptureSession.CaptureCallback() {
@Override
public void onCaptureCompleted(
@NonNull CameraCaptureSession session,
@NonNull CaptureRequest request,
@NonNull TotalCaptureResult result) {
previewRequestBuilder.set(triggerKey, triggerIdleValue);
}

@Override
public void onCaptureFailed(
@NonNull CameraCaptureSession session,
@NonNull CaptureRequest request,
@NonNull CaptureFailure failure) {
previewRequestBuilder.set(triggerKey, triggerIdleValue);
}
};
}

/**
* Capture a still picture. This method should be called when a response is received {@link
* #cameraCaptureCallback} from both lockFocus().
Expand Down Expand Up @@ -788,7 +815,11 @@ private void lockAutoFocus() {
CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest.CONTROL_AF_TRIGGER_START);

try {
captureSession.capture(previewRequestBuilder.build(), null, backgroundHandler);
captureSession.capture(
previewRequestBuilder.build(),
createTriggerResetCallback(
CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE),
backgroundHandler);
} catch (CameraAccessException e) {
String message =
(e.getMessage() == null)
Expand Down
56 changes: 56 additions & 0 deletions ...ges/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/CameraTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,62 @@ public void setFocusMode_shouldSendErrorEventOnLockAutoFocusCameraAccessExceptio
verify(mockDartMessenger, times(1)).sendCameraErrorEvent(any());
}

@Test
public void createTriggerResetCallback_shouldResetTriggerOnCaptureCompleted() {
CaptureRequest.Key<Integer> triggerKey = CaptureRequest.CONTROL_AF_TRIGGER;
int idleValue = CameraMetadata.CONTROL_AF_TRIGGER_IDLE;

CameraCaptureSession.CaptureCallback callback =
camera.createTriggerResetCallback(triggerKey, idleValue);

callback.onCaptureCompleted(
mock(CameraCaptureSession.class), mock(CaptureRequest.class), mock(TotalCaptureResult.class));

verify(mockPreviewRequestBuilder, times(1)).set(triggerKey, idleValue);
}

@Test
public void createTriggerResetCallback_shouldResetTriggerOnCaptureFailed() {
CaptureRequest.Key<Integer> triggerKey = CaptureRequest.CONTROL_AF_TRIGGER;
int idleValue = CameraMetadata.CONTROL_AF_TRIGGER_IDLE;

CameraCaptureSession.CaptureCallback callback =
camera.createTriggerResetCallback(triggerKey, idleValue);

callback.onCaptureFailed(
mock(CameraCaptureSession.class), mock(CaptureRequest.class), mock(CaptureFailure.class));

verify(mockPreviewRequestBuilder, times(1)).set(triggerKey, idleValue);
}

@Test
public void createTriggerResetCallback_shouldResetAEPrecaptureTriggerOnCaptureCompleted() {
CaptureRequest.Key<Integer> triggerKey = CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER;
int idleValue = CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;

CameraCaptureSession.CaptureCallback callback =
camera.createTriggerResetCallback(triggerKey, idleValue);

callback.onCaptureCompleted(
mock(CameraCaptureSession.class), mock(CaptureRequest.class), mock(TotalCaptureResult.class));

verify(mockPreviewRequestBuilder, times(1)).set(triggerKey, idleValue);
}

@Test
public void createTriggerResetCallback_shouldResetAEPrecaptureTriggerOnCaptureFailed() {
CaptureRequest.Key<Integer> triggerKey = CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER;
int idleValue = CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;

CameraCaptureSession.CaptureCallback callback =
camera.createTriggerResetCallback(triggerKey, idleValue);

callback.onCaptureFailed(
mock(CameraCaptureSession.class), mock(CaptureRequest.class), mock(CaptureFailure.class));

verify(mockPreviewRequestBuilder, times(1)).set(triggerKey, idleValue);
}

@Test
public void setFocusMode_shouldCallErrorOnResultOnCameraAccessException()
throws CameraAccessException {
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Android implementation of the camera plugin.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22

version: 0.10.10+16
version: 0.10.10+17

environment:
sdk: ^3.9.0
Expand Down