-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Fixed Camera Switching Bug #9671
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.
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
Fixed Camera Switching Bug #9671
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request effectively fixes the camera switching bug by introducing a more robust selection mechanism using CameraInfo. The changes are well-distributed across the Dart and native Android code. I've provided a few suggestions to improve code clarity, maintainability, and test correctness. Once these are addressed, this PR should be in great shape.
...era_android_camerax/android/src/test/java/io/flutter/plugins/camerax/CameraSelectorTest.java
Show resolved
Hide resolved
...android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorProxyApi.java
Outdated
Show resolved
Hide resolved
packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart
Show resolved
Hide resolved
camsim99
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall looks good! Left some comments.
...android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorProxyApi.java
Outdated
Show resolved
Hide resolved
...android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorProxyApi.java
Outdated
Show resolved
Hide resolved
...android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraSelectorProxyApi.java
Outdated
Show resolved
Hide resolved
packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart
Outdated
Show resolved
Hide resolved
packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart
Outdated
Show resolved
Hide resolved
| case null: | ||
| } | ||
|
|
||
| if (cameraInfo != null) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think to make sure this tests does what we want, we need to check if cameraInfo is the CameraInfo that maps to cameraDescriptions[0], so we need a tighter check here. Please correct me if I'm wrong though!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done. Also, I did sort of a "transitive verification." I can't access the CameraInfo that maps to cameraDescriptions[0] directly in the conditional stub check due to timing issues, so I directly check that cameraInfo is mockBackCameraInfoOne. I verify that mockBackCameraInfoOne is associated with cameraDescriptions[0] below.
// Verify the camera name used to create camera is associated with mockBackCameraInfoOne.
expect(
cameraNameToInfos[cameraDescriptions[0].name],
mockBackCameraInfoOne,
);
camsim99
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM :)
Fixed camera switching issue where phones with multiple back cameras could not correctly switch to some other chosen camera. Fixed by specifying a camera via its CameraInfo instead of its direction. Fixes flutter/flutter#164963 ## Pre-Review Checklist **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
flutter/packages@d914120...db6988d 2025-07-31 [email protected] [tool] Remove web drive hot reload workaround (flutter/packages#9704) 2025-07-30 [email protected] Fixed Camera Switching Bug (flutter/packages#9671) If this roll has caused a breakage, revert this CL and stop the roller 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
flutter/packages@d914120...db6988d 2025-07-31 [email protected] [tool] Remove web drive hot reload workaround (flutter/packages#9704) 2025-07-30 [email protected] Fixed Camera Switching Bug (flutter/packages#9671) If this roll has caused a breakage, revert this CL and stop the roller 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
flutter/packages@d914120...db6988d 2025-07-31 [email protected] [tool] Remove web drive hot reload workaround (flutter/packages#9704) 2025-07-30 [email protected] Fixed Camera Switching Bug (flutter/packages#9671) If this roll has caused a breakage, revert this CL and stop the roller 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
flutter/packages@d914120...db6988d 2025-07-31 [email protected] [tool] Remove web drive hot reload workaround (flutter/packages#9704) 2025-07-30 [email protected] Fixed Camera Switching Bug (flutter/packages#9671) If this roll has caused a breakage, revert this CL and stop the roller 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
flutter/packages@d914120...db6988d 2025-07-31 [email protected] [tool] Remove web drive hot reload workaround (flutter/packages#9704) 2025-07-30 [email protected] Fixed Camera Switching Bug (flutter/packages#9671) If this roll has caused a breakage, revert this CL and stop the roller 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
Fixed camera switching issue where phones with multiple back cameras could not correctly switch to some other chosen camera. Fixed by specifying a camera via its CameraInfo instead of its direction.
Fixes flutter/flutter#164963
Pre-Review Checklist
[shared_preferences]pubspec.yamlwith an appropriate new version according to the pub versioning philosophy, or I have commented below to indicate which version change exemption this PR falls under1.CHANGELOG.mdto add a description of the change, following repository CHANGELOG style, or I have commented below to indicate which CHANGELOG exemption this PR falls under1.///).If you need help, consider asking for advice on the #hackers-new channel on Discord.
Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the
gemini-code-assistbot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.Footnotes
Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. ↩ ↩2 ↩3