Skip to content

[Android] Fix respecting--enable-software-rendering in the embedding - #191321

Merged
auto-submit[bot] merged 4 commits into
flutter:masterfrom
camsim99:ff_esr
Aug 19, 2026
Merged

auto-submit[bot] merged 4 commits into
flutter:masterfrom
camsim99:ff_esr

Conversation

@camsim99

@camsim99 camsim99 commented Aug 18, 2026 •

Copy link
Copy Markdown
Contributor

Fixes regression caused by #190222 that accidentally stopped respecting the enable-software-rendering Intent flag in the Android embedding.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. 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.

@camsim99
camsim99 requested a review from a team as a code owner August 18, 2026 22:38
@camsim99
camsim99 requested review from jesswrd and removed request for a team August 18, 2026 22:38
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Aug 18, 2026

@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 updates FlutterEngineConnectionRegistry to check the manifest for software rendering configuration if it is not already enabled, and adds corresponding unit tests. The review feedback identifies that the new tests mock Intent but do not stub intent.hasExtra(...) to return true. This causes the intent-handling logic to be skipped during test execution, and the reviewer provides suggestions to stub this method.

@camsim99
camsim99 requested review from chingjun and mboetger August 18, 2026 22:54
@github-actions github-actions Bot added platform-android Android applications specifically engine flutter/engine related. See also e: labels. team-android Owned by Android platform team labels Aug 18, 2026

if (!useSoftwareRendering) {
// Check manifest for software rendering configuration.
useSoftwareRendering = flutterLoader.getSofwareRenderingEnabledViaManifest();

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.

Should this be moved to run before the if block above?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No because the warning is only related to useSoftwareRendering defined via Intent, not manifest.

@camsim99 camsim99 added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 18, 2026
@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Aug 18, 2026
@auto-submit

auto-submit Bot commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

autosubmit label was removed for flutter/flutter/191321, because - The status or check suite Dashboard Checks has failed. Please fix the issues identified (or deflake) before re-applying this label.

@chingjun chingjun added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 19, 2026
@camsim99 camsim99 added autosubmit Merge PR when tree becomes green via auto submit App and removed autosubmit Merge PR when tree becomes green via auto submit App labels Aug 19, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Aug 19, 2026
Merged via the queue into flutter:master with commit 45b3e37 Aug 19, 2026
27 of 28 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Aug 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD engine flutter/engine related. See also e: labels. platform-android Android applications specifically team-android Owned by Android platform team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants