Skip to content

[google_maps_flutter] Fix iOS &/&& logic#11994

Merged
auto-submit[bot] merged 1 commit into
flutter:mainfrom
stuartmorgan-g:maps-ios-downsample-fix
Jun 25, 2026
Merged

[google_maps_flutter] Fix iOS &/&& logic#11994
auto-submit[bot] merged 1 commit into
flutter:mainfrom
stuartmorgan-g:maps-ios-downsample-fix

Conversation

@stuartmorgan-g

Copy link
Copy Markdown
Collaborator

Fixes incorrect use of && and & in the tile downscaling logic added in #6377

The code would generally do the right thing by accident, because isFloat would always end up true, so it would downsample any 16-bit image. The incorrect operators cause complitation failure in some compilation environments, however (like google3).

Pre-Review Checklist

Footnotes

  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. 2

Fixes incorrect use of `&&` and `&` in the tile downscaling logic added
in flutter#6377

The code would generally do the right thing by accident, because
`isFloat` would always end up true, so it would downsample any
16-bit image. The incorrect operators cause complitation failure in some
compilation environments, however (like google3).
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jun 25, 2026
@flutter-dashboard

Copy link
Copy Markdown

It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@stuartmorgan-g

Copy link
Copy Markdown
Collaborator Author

test-exempt: failure is caught in google3 compilation environment

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

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 corrects bitwise and logical operators in FGMTileOverlayController.m across multiple iOS Google Maps packages to address compilation and logical issues in tile downscaling. The review feedback points out that assigning the bitwise result directly to a BOOL can lead to truncation and incorrect evaluation on certain architectures, and suggests explicitly comparing the result to 0.

@stuartmorgan-g stuartmorgan-g added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 25, 2026
@auto-submit auto-submit Bot merged commit e609a58 into flutter:main Jun 25, 2026
88 checks passed
@stuartmorgan-g stuartmorgan-g deleted the maps-ios-downsample-fix branch June 25, 2026 18:27
pull Bot pushed a commit to Mattlk13/flutter that referenced this pull request Jun 26, 2026
…er#188634)

flutter/packages@7ff3e1f...c1f7d92

2026-06-25 21270878+elliette@users.noreply.github.com [material_ui]
Enable `bottom_navigation_bar_test` (flutter/packages#12005)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove `widgets/` import in `flexible_space_bar_test.dart`,
`app_bar_sliver_test.dart` and partial fix in `chip_test.dart`
(flutter/packages#12004)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `animated_icon_test.dart` and
`autocomplete_test.dart` (flutter/packages#12000)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `app_bar_test.dart` (flutter/packages#11998)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `search_anchor_test.dart`
(flutter/packages#11997)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `menu_anchor_test.dart`
(flutter/packages#11995)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `scaffold_test.dart` (flutter/packages#11973)
2026-06-25 stuartmorgan@google.com [google_maps_flutter] Fix iOS &/&&
logic (flutter/packages#11994)
2026-06-25 engine-flutter-autoroll@skia.org Roll Flutter (stable) from
e1fd963 to ad70ec4 (5 revisions) (flutter/packages#11985)
2026-06-25 katelovett@google.com [CI] Fix labeler for cupertino_ui PRs
(flutter/packages#11988)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `slider_test.dart` (flutter/packages#11977)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `drawer_test.dart` (flutter/packages#11976)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `navigation_rail_test.dart`
(flutter/packages#11974)

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 flutter-ecosystem@google.com 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
andywolff pushed a commit to andywolff/flutter that referenced this pull request Jun 26, 2026
…er#188634)

flutter/packages@7ff3e1f...c1f7d92

2026-06-25 21270878+elliette@users.noreply.github.com [material_ui]
Enable `bottom_navigation_bar_test` (flutter/packages#12005)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove `widgets/` import in `flexible_space_bar_test.dart`,
`app_bar_sliver_test.dart` and partial fix in `chip_test.dart`
(flutter/packages#12004)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `animated_icon_test.dart` and
`autocomplete_test.dart` (flutter/packages#12000)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `app_bar_test.dart` (flutter/packages#11998)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `search_anchor_test.dart`
(flutter/packages#11997)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `menu_anchor_test.dart`
(flutter/packages#11995)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `scaffold_test.dart` (flutter/packages#11973)
2026-06-25 stuartmorgan@google.com [google_maps_flutter] Fix iOS &/&&
logic (flutter/packages#11994)
2026-06-25 engine-flutter-autoroll@skia.org Roll Flutter (stable) from
e1fd963 to ad70ec4 (5 revisions) (flutter/packages#11985)
2026-06-25 katelovett@google.com [CI] Fix labeler for cupertino_ui PRs
(flutter/packages#11988)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `slider_test.dart` (flutter/packages#11977)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `drawer_test.dart` (flutter/packages#11976)
2026-06-25 36861262+QuncCccccc@users.noreply.github.com [material_ui]
Remove widgets import in `navigation_rail_test.dart`
(flutter/packages#11974)

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 flutter-ecosystem@google.com 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App CICD Run CI/CD p: google_maps_flutter platform-ios

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants