[camera_android] Fix stopVideoRecording returning JPEG when takePicture runs during recording by Azim04 · Pull Request #13070 · flutter/packages

Azim04 · 2026-09-30T06:05:10Z

Description

When takePicture() is called during an active video recording, stopVideoRecording() could return the JPEG path instead of the MP4 path because a single captureFile field was shared.

This change introduces a dedicated videoCaptureFile for video recording and keeps captureFile for still capture.

Related Issue

Fixes flutter/flutter#192927

Tests

Unit tests in CameraTest.java
Integration test: stopVideoRecording returns mp4 after takePicture during recording

Pre-Review Checklist

google-cla · 2026-09-30T06:05:21Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

gemini-code-assist

Code Review

This pull request introduces a separate videoCaptureFile field in the Android camera implementation to prevent takePicture from overwriting the video path returned by stopVideoRecording when a photo is taken during an active video recording. It also adds corresponding unit tests to verify this behavior and handle cases where the video capture file is null. There are no review comments, and I have no feedback to provide.

Azim04 · 2026-09-30T06:11:36Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

Thanks, I signed the CLA just now.

Azim04 · 2026-09-30T06:15:12Z

Reopening to retrigger the CLA check. I have signed the CLA.

fluttergithubbot · 2026-09-30T06:15:14Z

An existing Git SHA, aed01593ed3154c6339121495275d00e0b90e0d4, was detected, and no actions were taken.

To re-trigger presubmits after closing or re-opeing a PR, or pushing a HEAD commit (i.e. with --force) that already was pushed before, push a blank commit (git commit --allow-empty -m "Trigger Build") or rebase to continue.

Azim04 · 2026-09-30T06:18:21Z

Closing the PR to retrigger the CLA after 1 hour

Azim04 · 2026-09-30T06:52:47Z

I signed the CLA.

fluttergithubbot · 2026-09-30T06:52:50Z

An existing Git SHA, aed01593ed3154c6339121495275d00e0b90e0d4, was detected, and no actions were taken.

To re-trigger presubmits after closing or re-opeing a PR, or pushing a HEAD commit (i.e. with --force) that already was pushed before, push a blank commit (git commit --allow-empty -m "Trigger Build") or rebase to continue.

Mairramer

Thanks for this PR! The bug fix makes sense, and the approach of decoupling videoCaptureFile from captureFile is clean and addresses the issue well.

I only left two minor comments regarding an outdated error message and a small adjustment to the test cleanup.

There are also several unintended changes in the PR. Please review them and remove any changes that are not related to this fix.

Mairramer · 2026-09-30T13:15:20Z

…cording Separate still-image and video capture file fields so takePicture() cannot overwrite the path returned by stopVideoRecording(). Fixes flutter/flutter#192927

Azim04

Description

When takePicture() is called during an active video recording, stopVideoRecording() could return the JPEG path instead of the MP4 path because a single captureFile field was shared.

This change introduces a dedicated videoCaptureFile for video recording and keeps captureFile for still capture.

Related Issue

Fixes flutter/flutter#192927

Tests

Unit tests in CameraTest.java
Integration test: stopVideoRecording returns mp4 after takePicture during recording

Pre-Review Checklist

Mairramer · 2026-10-01T11:42:43Z

@@ -1,3 +1,7 @@
+## NEXT


This should be ## 0.10.13, since it fixes an existing issue.

@Mairramer
Thanks for the response.
Updated the line in CHANGELOG.md

We also need to update this in pubspec.yaml.

Sure, I will update the pubspec.yaml

@Mairramer
I have bumped pubspec.yaml version from 0.10.12 to 0.12.13
Can you please review it?

Update changelog to reflect version 0.10.13.

Azim04

@Mairramer
Thanks for the response.
Updated the line in CHANGELOG.md

…st.java

Azim04 · 2026-10-12T05:12:35Z

@Azim04 It still looks like some files aren't formatted correctly. Could you check the format logs again?

I shared the wrong command earlier. The correct one is:
dart run script/tool/bin/flutter_plugin_tools.dart format --packages camera_android

Re-ran:
dart run script/tool/bin/flutter_plugin_tools.dart format --packages camera_android

Formatter updated Camera.java and CameraTest.java; pushed.

Azim04

@Mairramer Thanks — I re-ran:

dart run script/tool/bin/flutter_plugin_tools.dart format --packages camera_android

It updated Camera.java and CameraTest.java. Changes are pushed; please take another look when you have a moment.

camsim99 · 2026-11-02T19:05:27Z

+        expect(lengths[n], greaterThan(0));
+      }
+    });
+


The tests added above seem unrelated to the change. Can those be removed or added in a follow up PR instead?

Yes, Those tests are unrelated to this fix. I'll remove Control FPS, Control video bitrate, and Control audio bitrate from this PR and keep only stopVideoRecording returns mp4 after takePicture during recording.

camsim99

Overall looks good! I think we have an opportunity to improve the unit testing though, PTAL!

camsim99 · 2026-11-02T19:11:15Z

+
+    // Simulate takePicture() overwriting the shared field with a JPEG path
+    // (this is the bug we fixed by introducing videoCaptureFile).
+    cameraSpy.captureFile = new File(jpegPath);


Ideally, we call takePicture here instead of making captureFile visible for testing so that the test is reliant on videoCaptureFile existing separate from videoCaptureFile.

Done. captureFile is private again, and the test now calls takePicture() after prepareRecording(). stopVideoRecording() still returns the .mp4 path, so the test checks that videoCaptureFile stays separate from the JPEG written by takePicture().

Call takePicture() in the unit test so captureFile can stay private, and remove integration tests that are unrelated to this fix.

Azim04

Addressed both review comments:

captureFile is private again. The unit test now calls takePicture() after prepareRecording(), and stopVideoRecording() still returns the .mp4 path.
Removed the unrelated integration tests (Control FPS, Control video bitrate, and Control audio bitrate). This PR now only adds stopVideoRecording returns mp4 after takePicture during recording.

camsim99

Changes LGTM, thanks!!

…er#196381) flutter/packages@08faf64...653628e 2026-11-11 [email protected] Roll Flutter from fffd8c2 to b98afb5 (31 revisions) (flutter/packages#13623) 2026-11-11 [email protected] [material_ui] Document how to programmatically clear DropdownMenu selection (flutter/packages#13266) 2026-11-11 [email protected] [pigeon] Fix basePath resolution when paths share a string prefix with basePath (flutter/packages#13342) 2026-11-11 [email protected] [cupertino_ui] Fix CupertinoSheetRoute throwing when a drag ends during a pending relayout (flutter/packages#13316) 2026-11-11 [email protected] [shared_preferences] Updates Pigeon to 30.0.1 to support multi-engine registration and deregistration. (flutter/packages#13617) 2026-11-11 [email protected] [vector_graphics] Catch any throwable in useHtmlRenderObject() and cache HTML fallback (flutter/packages#13545) 2026-11-11 [email protected] [cupertino_ui] Include selectionHandleColor in NoDefaultCupertinoThemeData equality (flutter/packages#13450) 2026-11-11 [email protected] [flutter_svg] Remove failed async loads from Cache._pending (flutter/packages#13604) 2026-11-11 [email protected] [pigeon] Adds Native Interop FFI codec serialization for NS types (flutter/packages#13616) 2026-11-10 [email protected] [pigeon] Support multi-engine Native Interop registration and instance-aware unregistration (flutter/packages#13576) 2026-11-10 [email protected] [image_picker_ios] Convert the iOS example app and UI tests to Swift (flutter/packages#13570) 2026-11-10 [email protected] [cupertino_ui] Localize CupertinoActionSheet semantics label (flutter/packages#13377) 2026-11-10 [email protected] [camera_android] Fix stopVideoRecording returning JPEG when takePicture runs during recording (flutter/packages#13070) 2026-11-10 [email protected] [google_sign_in_android] Rename keep.xml to google_sign_in_keep.xml (flutter/packages#13475) 2026-11-10 [email protected] [web_benchmarks] Fix benchmark stalling when only repainting views that are dirty (flutter/packages#13089) 2026-11-10 [email protected] Roll Flutter from d463821 to fffd8c2 (21 revisions) (flutter/packages#13614) If this roll has caused a breakage, revert this CL and set the roller to dry run mode using the controls here: https://autoroll.skia.org/r/flutter-packages-flutter-autoroll Please CC [email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

github-actions Bot added p: camera platform-android labels Sep 30, 2026

gemini-code-assist Bot reviewed Sep 30, 2026

View reviewed changes

Azim04 closed this Sep 30, 2026

Azim04 reopened this Sep 30, 2026

Azim04 closed this Sep 30, 2026

Azim04 reopened this Sep 30, 2026

Mairramer reviewed Sep 30, 2026

View reviewed changes

Comment thread packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/Camera.java Resolved

Mairramer reviewed Sep 30, 2026

View reviewed changes

Comment thread packages/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/CameraTest.java Resolved

Mairramer requested changes Sep 30, 2026

View reviewed changes

Azim04 force-pushed the camera_android-fix-stop-recording-path branch from bb31bcb to 29a4001 Compare October 1, 2026 10:16

[camera_android] Fix stopVideoRecording returning JPEG path during re…

94fda02

…cording Separate still-image and video capture file fields so takePicture() cannot overwrite the path returned by stopVideoRecording(). Fixes flutter/flutter#192927

Azim04 force-pushed the camera_android-fix-stop-recording-path branch from 29a4001 to 94fda02 Compare October 1, 2026 11:07

Azim04 commented Oct 1, 2026

View reviewed changes

Azim04 requested a review from Mairramer October 1, 2026 11:11

Mairramer requested changes Oct 1, 2026

View reviewed changes

Mairramer added the CICD Run CI/CD label Oct 1, 2026

Release version 0.10.13 in changelog

85f4526

Update changelog to reflect version 0.10.13.

flutter-dashboard Bot removed the CICD Run CI/CD label Oct 1, 2026

Azim04 commented Oct 1, 2026

View reviewed changes

Azim04 requested a review from Mairramer October 1, 2026 11:51

Mairramer added the CICD Run CI/CD label Oct 1, 2026

[camera_android] Apply google-java-format to Camera.java and CameraTe…

2d7e5de

…st.java

Azim04 commented Oct 12, 2026

View reviewed changes

Merge branch 'main' into camera_android-fix-stop-recording-path

60af847

Mairramer added the CICD Run CI/CD label Oct 12, 2026

Mairramer requested a review from mboetger October 12, 2026 16:18

Mairramer approved these changes Oct 12, 2026

View reviewed changes

Merge branch 'main' into camera_android-fix-stop-recording-path

c7d24f8

flutter-dashboard Bot removed the CICD Run CI/CD label Oct 13, 2026

Azim04 and others added 2 commits October 27, 2026 15:56

Merge branch 'main' into camera_android-fix-stop-recording-path

baea0eb

Merge branch 'main' into camera_android-fix-stop-recording-path

adef293

Mairramer added the CICD Run CI/CD label Nov 1, 2026

Mairramer requested review from camsim99 and removed request for mboetger November 1, 2026 20:15

camsim99 reviewed Nov 2, 2026

View reviewed changes

[camera_android] Address review feedback on the recording path fix

3d7d8cb

Call takePicture() in the unit test so captureFile can stay private, and remove integration tests that are unrelated to this fix.

flutter-dashboard Bot removed the CICD Run CI/CD label Nov 5, 2026

Mairramer added the CICD Run CI/CD label Nov 5, 2026

Azim04 commented Nov 5, 2026

View reviewed changes

Merge branch 'main' into camera_android-fix-stop-recording-path

c91d477

flutter-dashboard Bot removed the CICD Run CI/CD label Nov 5, 2026

Azim04 requested a review from camsim99 November 5, 2026 12:22

Mairramer added the CICD Run CI/CD label Nov 5, 2026

camsim99 approved these changes Nov 10, 2026

View reviewed changes

camsim99 added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 10, 2026

auto-submit Bot merged commit 0f29291 into flutter:main Nov 10, 2026
14 checks passed

This was referenced Nov 11, 2026

Roll Packages from 08faf6409187 to b9397f207c07 (15 revisions) flutter/flutter#196380

Closed

Roll Packages from 08faf6409187 to 653628e8a646 (16 revisions) flutter/flutter#196381

Merged

Conversation

Azim04 commented Sep 30, 2026 • edited by Mairramer Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issue

Tests

Pre-Review Checklist

Uh oh!

google-cla Bot commented Sep 30, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Azim04 commented Sep 30, 2026

Uh oh!

Azim04 commented Sep 30, 2026

Uh oh!

fluttergithubbot commented Sep 30, 2026

Uh oh!

Azim04 commented Sep 30, 2026

Uh oh!

Azim04 commented Sep 30, 2026

Uh oh!

fluttergithubbot commented Sep 30, 2026

Uh oh!

Uh oh!

Uh oh!

Mairramer left a comment

Choose a reason for hiding this comment

Uh oh!

Mairramer commented Sep 30, 2026

Pre-Review Checklist

Footnotes

Uh oh!

Azim04 left a comment

Choose a reason for hiding this comment

Description

Related Issue

Tests

Pre-Review Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Azim04 left a comment

Choose a reason for hiding this comment

Uh oh!

Azim04 commented Oct 12, 2026

Uh oh!

Azim04 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Azim04 Nov 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

camsim99 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Azim04 left a comment

Choose a reason for hiding this comment

Uh oh!

camsim99 left a comment

Choose a reason for hiding this comment

Uh oh!

Azim04 commented Sep 30, 2026 •

edited by Mairramer

Loading

Azim04 left a comment •

edited

Loading

Azim04 Nov 5, 2026 •

edited

Loading