Fix Android map element options retention by AdamEssenmacher · Pull Request #35634 · dotnet/maui

AdamEssenmacher · 2026-05-27T07:51:36Z

Summary

Fix Android map element addition so temporary map element handlers/options are disconnected and disposed after Google Maps consumes the options.
Covers polyline, polygon, and circle add paths without changing public APIs.
Adds Android device tests for temporary-handler cleanup and post-add native updates.

Fixes #20502

Root Cause

Android MapHandler.AddPolyline/AddPolygon/AddCircle created temporary MapElementHandler instances to build Google Maps options, but left those handlers attached to the MAUI map elements after GoogleMap.Add* consumed the options. Large MapElements workloads could retain many temporary handlers/options and drive severe GREF pressure.

Validation

dotnet build Microsoft.Maui.BuildTasks.slnf
dotnet build src/Core/maps/src/Maps.csproj -f net10.0-android36.0
dotnet build src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj -f net10.0-android -p:EmbedAssembliesIntoApk=true
Android focused map tests on Pixel 9 Pro XL API 36: 9 passed, 0 failed
Android clean full Controls.DeviceTests run on Pixel 9 Pro XL API 36: 962 run, 942 passed, 7 failed, 13 skipped. Remaining failures were unrelated existing/device-environment failures in Border/Shell/Label; MapElementOptionsLifecycleTests passed 7/7 inside the full run.

> [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! ## What Restrict the agentic-labeler to apply **exactly one `area-*` label** per item, while still allowing multiple `platform/*` labels. ## Why Backfilling the 26 items affected by the `max:1` bug (fixed in dotnet#35540) revealed that the labeler occasionally applies multiple `area-*` labels for ambiguous cases: - **dotnet#35501** got both `area-layout` and `area-safearea` - **dotnet#35490** got both `area-navigation` and `area-controls-tabbedpage` The intended behavior is exactly one best-fit `area-*` per item (a label-quota distinction not expressible via `safe-outputs.add-labels.max:` — that field counts total labels, not labels per prefix). The fix has to live in the agent's instructions. ## Changes ### `.github/skills/agentic-labeler/SKILL.md` - Scope section: "Exactly one `area-*`" / "One or more `platform/*`". - Area rules section: renamed heading, changed "pick one or more" → "apply exactly one". - New **tie-breaking heuristics** for the area-* selection: - Specific control beats generic area (`area-controls-tabbedpage` over `area-navigation`) - Sub-area beats parent area (`area-safearea` over `area-layout`) - Subject-matter focus beats incidental touch - When genuinely tied, prefer the user-visible feature - Mixed-PR rule clarified: infra-primary PRs get only `area-infrastructure` (no second product area). ### `.github/workflows/agentic-labeler.md` - Added explicit reinforcement in the workflow prompt: "Apply exactly one `area-*` label … and one or more `platform/*` labels". - Fixed two stale `max: 1` comments left over from dotnet#35540 (the cap is now `max: 10`). ### `.github/workflows/agentic-labeler.lock.yml` - Regenerated via `gh aw compile`. Diff is frontmatter-hash + heredoc rotations only — no semantic change to the compiled config. ## Validation - Reviewed all 21 existing eval scenarios in `tests/eval.yaml` — none assert multiple `area-*` labels, so no test updates needed. - The `max: 10` cap in `safe-outputs` is preserved as a blast-radius safeguard (one area + several platforms still fit comfortably). ## Follow-ups (not in this PR) If accuracy of the "one area" rule drops below ~95% in eval runs, consider adding a deterministic post-step that strips extra `area-*` labels per a known precedence list (Option B from the design discussion). Co-authored-by: bot <bot@test> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

## Description Extends the `maui-copilot` DevDiv pipeline (pipeline 27723) with a 3-stage architecture that runs real UI tests on platform-pool agents and reports results directly in the AI summary PR comment. ### Pipeline Workflow ``` ┌─────────────────────────────────────────────────────────┐ │ Stage 1: ReviewPR │ │ │ │ STEP 1: Branch Setup (checkout + cherry-pick PR) │ │ STEP 2: Detect UI Test Categories │ │ STEP 3: Run Detected UI Tests (in-process, fast) │ │ STEP 4: Regression Cross-Reference │ │ STEP 5: Gate — verify tests fail/pass before/after fix │ │ STEP 6: Code Review — deep analysis via Copilot agent │ │ │ │ Outputs → CopilotLogs artifact + detectedCategories │ └──────────────────────┬──────────────────────────────────┘ │ ┌──────────────────────▼──────────────────────────────────┐ │ Stage 2: RunDeepUITests (platform-pool agent) │ │ │ │ iOS: AcesShared Tahoe + iOS 26.4 │ │ Android: ubuntu-22.04 + KVM + AVD │ │ │ │ Runs BuildAndRunHostApp.ps1 per detected category │ │ Outputs → drop-deep-uitests artifact (TRX + diffs) │ └──────────────────────┬──────────────────────────────────┘ │ ┌──────────────────────▼──────────────────────────────────┐ │ Stage 3: PostResults │ │ │ │ 1. Download CopilotLogs (review content files) │ │ 2. Download drop-deep-uitests (TRX results) │ │ 3. Merge deep results into uitests/content.md │ │ 4. Post full AI Summary comment on PR │ │ 5. Apply labels (s/agent-reviewed, etc.) │ │ │ │ One comment with everything — no patching needed │ └─────────────────────────────────────────────────────────┘ ``` ### What's New **Deep UI Test Execution (Stage 2)** - Runs detected UI test categories on proper platform-pool agents (not in-process on Linux) - **iOS**: AcesShared Tahoe agents with iOS 26.4 simulator, iPhone 11 Pro (matching `ios-26` baselines from PR dotnet#35061) - **Android**: ubuntu-22.04 with KVM, AVD boot with `-partition-size 2048`, `ignoreHiddenApiPolicyError` capability - TRX results + snapshot-diff PNGs published as `drop-deep-uitests` artifact **Unified Comment Posting (Stage 3)** - Comment posting and label application deferred to Stage 3 (after deep tests complete) - Single AI summary comment includes ALL results: code review + deep test results - Nested collapsible `<details>` for failed tests with full error + stack trace - Dynamic section title: `🧪 UI Tests — CollectionView, TabbedPage` - Artifact download link for snapshot-diff PNGs **Android Emulator Improvements** - AVD boot step with proper partition size, ADB key pre-authorization, boot wait - `DEVICE_UDID` pass-through prevents double emulator boot - Disk cleanup on hosted ubuntu agents (frees ~22GB) - KVM enablement + `appium:ignoreHiddenApiPolicyError` for API 30 **iOS Simulator Improvements** - Tahoe pool demand ensures macOS 26.x agents - Explicit iOS 26.4 download via latest Xcode - Auto-creates iPhone 11 Pro for baseline resolution match ### Validation Tested across 30+ pipeline iterations on 6 PRs: | PR | iOS | Android | |---|---|---| | 35358 (ViewBaseTests) | **112/112 ALL PASS** ✅ | **118/119 PASS** ✅ | | 35359 (TabbedPage) | 44/50 (1 real failure) | 74/75 (1 real failure) | | 35356 (CollectionView) | **415/417 PASS** ✅ | 593/619 (26 real failures) | --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

@PureWeen

…35589) > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! Backport of dotnet#35460 to `main`. /cc @PureWeen Co-authored-by: HarishKumarSF4517 <harish.kumar@syncfusion.com>

github-actions · 2026-05-27T07:51:48Z

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 35634

Or

Run remotely in PowerShell:

iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 35634"

dotnet-policy-service · 2026-05-27T07:52:01Z

Hey there @@AdamEssenmacher! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed.

kubaflo · 2026-05-27T11:32:15Z

/review -b feature/refactor-copilot-yml

MauiBot · 2026-05-27T16:53:01Z

🤖 AI Summary

👋 @AdamEssenmacher — new AI review results are available. Please review the latest session below.

📊 Review Session — f51bd19 · Fix Android map element options retention · 2026-05-27 16:52 UTC

🚦 Gate — Test Before & After Fix

Gate Result: ✅ PASSED

Platform: ANDROID · Base: main · Merge base: b0ea772f

Test	Without Fix (expect FAIL)	With Fix (expect PASS)
📱 MapElementOptionsLifecycleTests (PolylineHandlerIsNotRetainedAfterAdd, PolygonHandlerIsNotRetainedAfterAdd, CircleHandlerIsNotRetainedAfterAdd, MutatingPolylineAfterAddDoesNotKeepTemporaryHandler, MutatingPolylineAfterAddUpdatesNativePolyline, MutatingPolygonAfterAddUpdatesNativePolygon, MutatingCircleAfterAddUpdatesNativeCircle) `Category=Map`	✅ FAIL — 796s	✅ PASS — 247s

🔴 Without fix — 📱 MapElementOptionsLifecycleTests (PolylineHandlerIsNotRetainedAfterAdd, PolygonHandlerIsNotRetainedAfterAdd, CircleHandlerIsNotRetainedAfterAdd, MutatingPolylineAfterAddDoesNotKeepTemporaryHandler, MutatingPolylineAfterAddUpdatesNativePolyline, MutatingPolygonAfterAddUpdatesNativePolygon, MutatingCircleAfterAddUpdatesNativeCircle): FAIL ✅ · 796s

(truncated to last 15,000 chars)

7 05:06:01.956 15538 15801 I DOTNET  : 
      05-27 05:06:07.123 15538 15819 I DOTNET  :    Test name: PolygonHandlerIsNotRetainedAfterAdd
      05-27 05:06:07.123 15538 15819 I DOTNET  :    Exception messages: The temporary MapElementHandler should not remain attached after adding the element.
      05-27 05:06:07.123 15538 15819 I DOTNET  :    Exception stack traces:    at Microsoft.Maui.DeviceTests.AssertHelpers.AssertEventually(Func`1 assertion, Int32 timeout, Int32 interval, String message)
      05-27 05:06:07.123 15538 15819 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AssertNoTemporaryHandlerAsync(MapElement mapElement)
      05-27 05:06:07.123 15538 15819 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AddMapElementAndWaitForNativeIdAsync(MapElement mapElement)
      05-27 05:06:07.123 15538 15819 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.PolygonHandlerIsNotRetainedAfterAdd()
      05-27 05:06:07.123 15538 15819 I DOTNET  : --- End of stack trace from previous location ---
      05-27 05:06:07.123 15538 15819 I DOTNET  :    Execution time: 5.1664734
      05-27 05:06:07.123 15538 15819 I DOTNET  :    Test trait name: Category
      05-27 05:06:07.123 15538 15819 I DOTNET  :       value: Map
      05-27 05:06:07.123 15538 15819 I DOTNET  : 	[FAIL] PolygonHandlerIsNotRetainedAfterAdd
      05-27 05:06:07.123 15538 15819 I DOTNET  : 	[FAIL] PolygonHandlerIsNotRetainedAfterAdd   Test name: PolygonHandlerIsNotRetainedAfterAdd
      05-27 05:06:07.123 15538 15819 I DOTNET  :    Assembly:  [Microsoft.Maui.Controls.DeviceTests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=null]
      05-27 05:06:07.123 15538 15819 I DOTNET  :    Exception messages: The temporary MapElementHandler should not remain attached after adding the element.   Exception stack traces:    at Microsoft.Maui.DeviceTests.AssertHelpers.AssertEventually(Func`1 assertion, Int32 timeout, Int32 interval, String message)
      05-27 05:06:07.123 15538 15819 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AssertNoTemporaryHandlerAsync(MapElement mapElement)
      05-27 05:06:07.123 15538 15819 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AddMapElementAndWaitForNativeIdAsync(MapElement mapElement)
      05-27 05:06:07.123 15538 15819 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.PolygonHandlerIsNotRetainedAfterAdd()
      05-27 05:06:07.123 15538 15819 I DOTNET  : --- End of stack trace from previous location ---
      05-27 05:06:07.123 15538 15819 I DOTNET  :    Execution time: 5.1664734
      05-27 05:06:07.123 15538 15819 I DOTNET  :    Test trait name: Category
      05-27 05:06:07.123 15538 15819 I DOTNET  :       value: Map
      05-27 05:06:07.123 15538 15819 I DOTNET  : 
      05-27 05:06:07.124 15538 15819 I DOTNET  : Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests 36.7232608 ms
      05-27 05:06:07.133 15538 15565 I DOTNET  : Failed tests:
      05-27 05:06:07.133 15538 15565 I DOTNET  : 1) 	[FAIL] CircleHandlerIsNotRetainedAfterAdd   Test name: CircleHandlerIsNotRetainedAfterAdd
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Assembly:  [Microsoft.Maui.Controls.DeviceTests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=null]
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Exception messages: The temporary MapElementHandler should not remain attached after adding the element.   Exception stack traces:    at Microsoft.Maui.DeviceTests.AssertHelpers.AssertEventually(Func`1 assertion, Int32 timeout, Int32 interval, String message)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AssertNoTemporaryHandlerAsync(MapElement mapElement)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AddMapElementAndWaitForNativeIdAsync(MapElement mapElement)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.CircleHandlerIsNotRetainedAfterAdd()
      05-27 05:06:07.133 15538 15565 I DOTNET  : --- End of stack trace from previous location ---
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Execution time: 5.6378647
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Test trait name: Category
      05-27 05:06:07.133 15538 15565 I DOTNET  :       value: Map
      05-27 05:06:07.133 15538 15565 I DOTNET  : 
      05-27 05:06:07.133 15538 15565 I DOTNET  : 2) 	[FAIL] MutatingPolylineAfterAddDoesNotKeepTemporaryHandler   Test name: MutatingPolylineAfterAddDoesNotKeepTemporaryHandler
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Assembly:  [Microsoft.Maui.Controls.DeviceTests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=null]
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Exception messages: The temporary MapElementHandler should not remain attached after adding the element.   Exception stack traces:    at Microsoft.Maui.DeviceTests.AssertHelpers.AssertEventually(Func`1 assertion, Int32 timeout, Int32 interval, String message)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AssertNoTemporaryHandlerAsync(MapElement mapElement)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AddMapElementAndWaitForNativeIdAsync(MapElement mapElement)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.MutatingPolylineAfterAddDoesNotKeepTemporaryHandler()
      05-27 05:06:07.133 15538 15565 I DOTNET  : --- End of stack trace from previous location ---
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Execution time: 5.1849741
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Test trait name: Category
      05-27 05:06:07.133 15538 15565 I DOTNET  :       value: Map
      05-27 05:06:07.133 15538 15565 I DOTNET  : 
      05-27 05:06:07.133 15538 15565 I DOTNET  : 3) 	[FAIL] MutatingPolygonAfterAddUpdatesNativePolygon   Test name: MutatingPolygonAfterAddUpdatesNativePolygon
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Assembly:  [Microsoft.Maui.Controls.DeviceTests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=null]
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Exception messages: The temporary MapElementHandler should not remain attached after adding the element.   Exception stack traces:    at Microsoft.Maui.DeviceTests.AssertHelpers.AssertEventually(Func`1 assertion, Int32 timeout, Int32 interval, String message)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AssertNoTemporaryHandlerAsync(MapElement mapElement)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AddMapElementAndWaitForNativeIdAsync(MapElement mapElement)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.MutatingPolygonAfterAddUpdatesNativePolygon()
      05-27 05:06:07.133 15538 15565 I DOTNET  : --- End of stack trace from previous location ---
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Execution time: 5.170327
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Test trait name: Category
      05-27 05:06:07.133 15538 15565 I DOTNET  :       value: Map
      05-27 05:06:07.133 15538 15565 I DOTNET  : 
      05-27 05:06:07.133 15538 15565 I DOTNET  : 4) 	[FAIL] MutatingCircleAfterAddUpdatesNativeCircle   Test name: MutatingCircleAfterAddUpdatesNativeCircle
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Assembly:  [Microsoft.Maui.Controls.DeviceTests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=null]
      05-27 05:06:07.133 15538 15565 I DOTNET  :    Exception messages: The temporary MapElementHandler should not remain attached after adding the element.   Exception stack traces:    at Microsoft.Maui.DeviceTests.AssertHelpers.AssertEventually(Func`1 assertion, Int32 timeout, Int32 interval, String message)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AssertNoTemporaryHandlerAsync(MapElement mapElement)
      05-27 05:06:07.133 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AddMapElementAndWaitForNativeIdAsync(MapElement mapElement)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.MutatingCircleAfterAddUpdatesNativeCircle()
      05-27 05:06:07.134 15538 15565 I DOTNET  : --- End of stack trace from previous location ---
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Execution time: 5.1865423
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Test trait name: Category
      05-27 05:06:07.134 15538 15565 I DOTNET  :       value: Map
      05-27 05:06:07.134 15538 15565 I DOTNET  : 
      05-27 05:06:07.134 15538 15565 I DOTNET  : 5) 	[FAIL] PolylineHandlerIsNotRetainedAfterAdd   Test name: PolylineHandlerIsNotRetainedAfterAdd
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Assembly:  [Microsoft.Maui.Controls.DeviceTests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=null]
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Exception messages: The temporary MapElementHandler should not remain attached after adding the element.   Exception stack traces:    at Microsoft.Maui.DeviceTests.AssertHelpers.AssertEventually(Func`1 assertion, Int32 timeout, Int32 interval, String message)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AssertNoTemporaryHandlerAsync(MapElement mapElement)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AddMapElementAndWaitForNativeIdAsync(MapElement mapElement)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.PolylineHandlerIsNotRetainedAfterAdd()
      05-27 05:06:07.134 15538 15565 I DOTNET  : --- End of stack trace from previous location ---
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Execution time: 5.1908128
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Test trait name: Category
      05-27 05:06:07.134 15538 15565 I DOTNET  :       value: Map
      05-27 05:06:07.134 15538 15565 I DOTNET  : 
      05-27 05:06:07.134 15538 15565 I DOTNET  : 6) 	[FAIL] MutatingPolylineAfterAddUpdatesNativePolyline   Test name: MutatingPolylineAfterAddUpdatesNativePolyline
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Assembly:  [Microsoft.Maui.Controls.DeviceTests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=null]
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Exception messages: The temporary MapElementHandler should not remain attached after adding the element.   Exception stack traces:    at Microsoft.Maui.DeviceTests.AssertHelpers.AssertEventually(Func`1 assertion, Int32 timeout, Int32 interval, String message)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AssertNoTemporaryHandlerAsync(MapElement mapElement)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AddMapElementAndWaitForNativeIdAsync(MapElement mapElement)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.MutatingPolylineAfterAddUpdatesNativePolyline()
      05-27 05:06:07.134 15538 15565 I DOTNET  : --- End of stack trace from previous location ---
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Execution time: 5.1862665
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Test trait name: Category
      05-27 05:06:07.134 15538 15565 I DOTNET  :       value: Map
      05-27 05:06:07.134 15538 15565 I DOTNET  : 
      05-27 05:06:07.134 15538 15565 I DOTNET  : 7) 	[FAIL] PolygonHandlerIsNotRetainedAfterAdd   Test name: PolygonHandlerIsNotRetainedAfterAdd
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Assembly:  [Microsoft.Maui.Controls.DeviceTests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=null]
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Exception messages: The temporary MapElementHandler should not remain attached after adding the element.   Exception stack traces:    at Microsoft.Maui.DeviceTests.AssertHelpers.AssertEventually(Func`1 assertion, Int32 timeout, Int32 interval, String message)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AssertNoTemporaryHandlerAsync(MapElement mapElement)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.AddMapElementAndWaitForNativeIdAsync(MapElement mapElement)
      05-27 05:06:07.134 15538 15565 I DOTNET  :    at Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests.PolygonHandlerIsNotRetainedAfterAdd()
      05-27 05:06:07.134 15538 15565 I DOTNET  : --- End of stack trace from previous location ---
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Execution time: 5.1664734
      05-27 05:06:07.134 15538 15565 I DOTNET  :    Test trait name: Category
      05-27 05:06:07.134 15538 15565 I DOTNET  :       value: Map
      05-27 05:06:07.134 15538 15565 I DOTNET  : 
      05-27 05:06:07.155 15538 15565 I DOTNET  : Xml file was written to the provided writer.
      05-27 05:06:07.156 15538 15565 I DOTNET  : Tests run: 566 Passed: 2 Inconclusive: 0 Failed: 7 Ignored: 557
�[41m�[30mfail�[39m�[22m�[49m: Non-success instrumentation exit code: 1, expected: 0
�[40m�[32minfo�[39m�[22m�[49m: <<XHARNESS_RESULT_START>>
      {
        "version": 1,
        "machineName": "runnervmfuwn7",
        "exitCode": 1,
        "exitCodeName": "TESTS_FAILED",
        "platform": "android",
        "instrumentationExitCode": 1,
        "device": "emulator-5554",
        "deviceOsVersion": "API 30",
        "architecture": "x86_64",
        "files": [
          {
            "name": "testResults.xml",
            "type": "test-results"
          },
          {
            "name": "adb-logcat-com.microsoft.maui.controls.devicetests-default.log",
            "type": "logcat"
          }
        ]
      }
      <<XHARNESS_RESULT_END>>
�[40m�[32minfo�[39m�[22m�[49m: Attempting to remove apk 'com.microsoft.maui.controls.devicetests'..
�[40m�[37mdbug�[39m�[22m�[49m: Executing command: '/home/vsts/.nuget/packages/microsoft.dotnet.xharness.cli/11.0.0-prerelease.26230.4/runtimes/any/native/adb/linux/adb -s emulator-5554 uninstall com.microsoft.maui.controls.devicetests'
�[40m�[32minfo�[39m�[22m�[49m: Successfully uninstalled com.microsoft.maui.controls.devicetests
XHarness exit code: 1 (TESTS_FAILED)
  Tests completed with exit code: 1

🟢 With fix — 📱 MapElementOptionsLifecycleTests (PolylineHandlerIsNotRetainedAfterAdd, PolygonHandlerIsNotRetainedAfterAdd, CircleHandlerIsNotRetainedAfterAdd, MutatingPolylineAfterAddDoesNotKeepTemporaryHandler, MutatingPolylineAfterAddUpdatesNativePolyline, MutatingPolygonAfterAddUpdatesNativePolygon, MutatingCircleAfterAddUpdatesNativeCircle): PASS ✅ · 247s

(truncated to last 15,000 chars)

372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Frame'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Gesture'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'HybridWebView'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Image'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Label'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Layout'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Lifecycle'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'ListView'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'MenuFlyout'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Mapper'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Excluded test (filtered by Trait; 'Category':'Memory'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Modal'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'NavigationPage'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Page'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Path'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Picker'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'RadioButton'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'RefreshView'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'ScrollView'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'SearchBar'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.763 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Shape'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Shell'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Slider'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'SwipeView'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'TabbedPage'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'TextInput'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Toolbar'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'TemplatedView'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'View'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'VisualElement'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'VisualElementTree'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'WebView'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Window'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'WindowOverlay'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Xaml'): [Memory] BindableLayout Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Accessibility'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Application'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Behavior'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Border'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'BoxView'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Button'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'CarouselView'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'CheckBox'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'CollectionView'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Compatibility'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'ContentView'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'DatePicker'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Dispatcher'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Editor'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Element'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Entry'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'FlexLayout'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'FlyoutPage'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Frame'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Gesture'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'HybridWebView'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Image'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Label'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Layout'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Lifecycle'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'ListView'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'MenuFlyout'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Mapper'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Excluded test (filtered by Trait; 'Category':'Memory'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Modal'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'NavigationPage'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Page'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Path'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Picker'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'RadioButton'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'RefreshView'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'ScrollView'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'SearchBar'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Shape'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Shell'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Slider'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'SwipeView'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'TabbedPage'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'TextInput'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'Toolbar'): [Memory] Window Does Not Leak
      05-27 05:10:16.764 16345 16372 I DOTNET  : [FILTER] Included test (filtered by Trait; 'Category':'TemplatedView'): [Memory] Window Does Not Leak
      05-27 05:10:16.786 16345 16372 I DOTNET  : [Test environment: 64-bit .NET .NET 10.0 [collection-per-class, non-parallel]]
      05-27 05:10:16.786 16345 16372 I DOTNET  : [Test framework: xUnit.net 2.9.0.0]
      05-27 05:10:16.804 16345 16372 I DOTNET  : Test collection for Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests
      05-27 05:10:17.513 16345 16435 I DOTNET  : 	[PASS] CircleHandlerIsNotRetainedAfterAdd
      05-27 05:10:17.644 16345 16452 I DOTNET  : 	[PASS] MutatingPolylineAfterAddDoesNotKeepTemporaryHandler
      05-27 05:10:17.702 16345 16466 I DOTNET  : 	[PASS] MutatingPolygonAfterAddUpdatesNativePolygon
      05-27 05:10:17.747 16345 16480 I DOTNET  : 	[PASS] MutatingCircleAfterAddUpdatesNativeCircle
      05-27 05:10:17.783 16345 16494 I DOTNET  : 	[PASS] PolylineHandlerIsNotRetainedAfterAdd
      05-27 05:10:17.826 16345 16509 I DOTNET  : 	[PASS] MutatingPolylineAfterAddUpdatesNativePolyline
      05-27 05:10:17.864 16345 16523 I DOTNET  : 	[PASS] PolygonHandlerIsNotRetainedAfterAdd
      05-27 05:10:17.872 16345 16523 I DOTNET  : Microsoft.Maui.DeviceTests.MapElementOptionsLifecycleTests 0.9163866 ms
      05-27 05:10:17.876 16345 16523 I DOTNET  : Test collection for Microsoft.Maui.DeviceTests.AlertDialogTests
      05-27 05:10:18.039 16345 16529 I DOTNET  : 	[PASS] AlertDialogButtonColorDarkTheme
      05-27 05:10:18.079 16345 16529 I DOTNET  : 	[PASS] AlertDialogButtonColorLightTheme
      05-27 05:10:18.079 16345 16529 I DOTNET  : Microsoft.Maui.DeviceTests.AlertDialogTests 0.2004998 ms
      05-27 05:10:18.309 16345 16372 I DOTNET  : Xml file was written to the provided writer.
      05-27 05:10:18.309 16345 16372 I DOTNET  : Tests run: 566 Passed: 9 Inconclusive: 0 Failed: 0 Ignored: 557
�[40m�[32minfo�[39m�[22m�[49m: <<XHARNESS_RESULT_START>>
      {
        "version": 1,
        "machineName": "runnervmfuwn7",
        "exitCode": 0,
        "exitCodeName": "SUCCESS",
        "platform": "android",
        "instrumentationExitCode": 0,
        "device": "emulator-5554",
        "deviceOsVersion": "API 30",
        "architecture": "x86_64",
        "files": [
          {
            "name": "testResults.xml",
            "type": "test-results"
          },
          {
            "name": "adb-logcat-com.microsoft.maui.controls.devicetests-default.log",
            "type": "logcat"
          }
        ]
      }
      <<XHARNESS_RESULT_END>>
�[40m�[32minfo�[39m�[22m�[49m: Attempting to remove apk 'com.microsoft.maui.controls.devicetests'..
�[40m�[37mdbug�[39m�[22m�[49m: Executing command: '/home/vsts/.nuget/packages/microsoft.dotnet.xharness.cli/11.0.0-prerelease.26230.4/runtimes/any/native/adb/linux/adb -s emulator-5554 uninstall com.microsoft.maui.controls.devicetests'
�[40m�[32minfo�[39m�[22m�[49m: Successfully uninstalled com.microsoft.maui.controls.devicetests
XHarness exit code: 0
  Tests completed successfully

📁 Fix files reverted (2 files)

eng/pipelines/ci-copilot.yml
src/Core/maps/src/Handlers/Map/MapHandler.Android.cs

New files (not reverted):

src/Core/maps/src/Handlers/Map/MapElementPlatformOptions.Android.cs

🧪 UI Tests

Full UI test matrix will run (no specific categories detected from PR changes).

🔍 Regression Cross-Reference

🔍 Regression Cross-Reference

🟢 No regression risks detected. No labeled bug-fix PRs in the last 6 months touched the modified files.

🔍 Pre-Flight — Context & Validation

Issue: #20502 - [Regression] [Android] [Maps] Map locks up after rendering 50 Polylines
PR: #35634 - Fix Android map element options retention
Platforms Affected: Android
Files Changed: 2 implementation, 2 test/config

Key Findings

Issue reproduces on Android maps with many Polyline/Polygon map elements and severe GREF pressure; issue discussion confirmed native Google Maps API usage avoids the lockup.
PR changes Android map element add paths for Polyline, Polygon, and Circle so temporary handlers/options are cleaned up after Google Maps consumes options.
No inline review comments were present on the PR; PR comments are bot/dogfood and review-trigger comments only.
Test type is Android device tests ([Category(TestCategory.Map)]) plus Android manifest test configuration.
Impacted UI/device category: Map.

Code Review Summary

Verdict: LGTM
Confidence: high
Errors: 0 | Warnings: 1 | Suggestions: 2

Key code review findings:

⚠️ src/Core/maps/src/Handlers/Map/MapHandler.Android.cs: exception messages for polygon/circle now check native return values but still say options are null.
💡 src/Core/maps/src/Handlers/Map/MapHandler.Android.cs: AddPins appears to have the same temporary-handler retention pattern, but is outside this PR's map-element scope.
💡 src/Controls/tests/DeviceTests/Elements/Map/MapElementOptionsLifecycleTests.Android.cs: shared AreClose tolerance is used for coordinates, widths, and radii.

Fix Candidates

#	Source	Approach	Test Result	Files Changed	Notes
PR	PR #35634	Create a helper that creates a temporary map element handler, invokes Google Maps `Add*` with the generated options, then disconnects the handler and disposes options in `finally`.	✅ PASSED (Gate)	`MapHandler.Android.cs`, `MapElementPlatformOptions.Android.cs`, Android device tests, manifest	Original PR

🔬 Code Review — Deep Analysis

Code Review — PR #35634

Independent Assessment

What this changes: Introduces MapElementPlatformOptions.InvokeWithOptions<TOptions, TResult> — a helper that creates a temporary handler for a map element, extracts the platform options, calls a callback with them, and then unconditionally disconnects the handler + disposes the options in a finally block. Refactors AddPolyline, AddPolygon, and AddCircle to use this helper. Adds device tests for handler lifecycle and native-object mutation.

Inferred motivation: The old code called mapElement.ToHandler(MauiContext) to get PolylineOptions/PolygonOptions/CircleOptions, but never called DisconnectHandler() or disposed those objects after the Google Maps AddXxx() consumed them. With large collections (hundreds of polylines with thousands of points) this left many JNI-pinned Java objects alive, exhausting the Android GREF quota and causing the GC spiral described in the issue.

Reconciliation with PR Narrative

Author claims: Handler/options are disconnected and disposed after Google Maps consumes them; covers all three element types; no public API change; device tests added.

Agreement: Code and claims match exactly. The finally block in InvokeWithOptions guarantees cleanup even if the callback throws.

Findings

⚠️ Warning — Error messages are now semantically incorrect after refactor

File: src/Core/maps/src/Handlers/Map/MapHandler.Android.cs, lines 647 and 672

Before this PR, the checks were on PolygonOptions/CircleOptions, so the exception messages were accurate. After the refactor, the checks are on the native return values from map.AddPolygon(options) and map.AddCircle(options), not on the options objects. If the exception ever fires, the current messages ("PolygonOptions is null", "CircleOptions is null") would misdirect debugging.

💡 Suggestion — `AddPins` has the identical handler-leak pattern, now left unaddressed

File: src/Core/maps/src/Handlers/Map/MapHandler.Android.cs, line 461

pin.ToHandler(MauiContext) creates a temporary pin handler and MarkerOptions, then Map.AddMarker(iMapPinHandler.PlatformView) consumes the options, but the temporary handler is not disconnected. This is outside the stated map-element scope, but likely deserves a follow-up.

💡 Suggestion — `AreClose` in the test mixes coordinate tolerance with width/radius tolerance

File: src/Controls/tests/DeviceTests/Elements/Map/MapElementOptionsLifecycleTests.Android.cs, line 224

A single 0.0001 tolerance is used for lat/lng values, stroke widths, and radius values. It works for these exact assertions but may be less clear for future edits.

Devil's Advocate

The misleading exception text is not a correctness blocker because the null path is practically unreachable unless handler registration is broken, and CI/build failures would catch many such cases. Disposing options after map.AddPolyline/AddPolygon/AddCircle should be safe because Google Maps copies the options into native map objects before returning; the returned native objects remain alive and are tracked separately.

Verdict: LGTM

Confidence: high
Summary: The fix directly addresses the Android GREF retention root cause by disconnecting temporary map-element handlers and disposing consumed options for polyline, polygon, and circle add paths. Tests cover handler cleanup and post-add native updates. The only warning is misleading exception text introduced by the refactor, which is easy to improve but not blocking.

🔧 Fix — Analysis & Comparison

Fix Candidates

#	Source	Approach	Test Result	Files Changed	Notes
1	try-fix	Build Google Maps options without calling `ToHandler()` by using a lightweight internal `IMapElementHandler` adapter and existing static `MapElementHandler` mapping methods.	✅ PASS	2 files	Stronger temporary-handler lifetime guarantee because `mapElement.Handler` is never set, but not better than PR because it bypasses `MapElementHandler.Mapper` customizations.
2	try-fix	Move initial Android option construction into `MapHandler.Android.cs` private factories that mirror existing post-add native update logic, with immediate option disposal after `GoogleMap.Add*`.	✅ PASS	2 files	Simpler/no handler path, but duplicates mapping logic and bypasses `MapElementHandler.Mapper`; not better than PR.
PR	PR #35634	Create `MapElementPlatformOptions.InvokeWithOptions`, call `ToHandler()` so DI/mapper pipeline runs, invoke Google Maps `Add*`, then disconnect the temporary handler and dispose options in `finally`.	✅ PASSED (Gate)	4 files	Original PR; preserves mapper extensibility while fixing retained temporary handlers/options.

Cross-Pollination

Model	Round	New Ideas?	Details
maui-expert-reviewer	1	Yes	Candidate 1: lightweight handler adapter that avoids `ToHandler()` and uses existing static mapper methods.
maui-expert-reviewer	2	Yes	Candidate 2: `MapHandler`-owned option factories aligned with post-add update paths.
maui-expert-reviewer	3	No	No viable third structural candidate. Any approach preserving mapper extensibility reduces to create handler -> run mapper -> extract options -> Add* -> dispose options, which is the PR fix. Retained-handler/platform-view-swap redesign is much larger and worse for this bug.

Exhausted: Yes
Selected Fix: PR #35634 — It is the best tradeoff. Both passing alternatives avoid temporary real handlers entirely, but they do so by bypassing the MapElementHandler.Mapper customization pipeline and/or duplicating mapping logic. The PR fix passes the gate, preserves DI/mapper extensibility, and bounds temporary handler/options lifetime with finally cleanup.

--- attempt 1 ---

try-fix-1 — Build options without temporary handlers

Approach: Add internal Android MapElementHandler.Build*Options methods that create PolylineOptions, PolygonOptions, and CircleOptions directly through a lightweight IMapElementHandler adapter, then update MapHandler.AddPolyline/AddPolygon/AddCircle to call Google Maps with those options inside a using scope.

Different from PR fix: PR #35634 still creates a temporary real handler through ToHandler() and then disconnects/disposes it. This candidate never calls ToHandler() for initial add, so mapElement.Handler is never assigned.

Diff: See CustomAgentLogsTmp/PRState/35634/PRAgent/try-fix/attempt-1/fix.diff.

Test results: ✅ PASS — pwsh .github/skills/run-device-tests/scripts/Run-DeviceTests.ps1 -Project Controls -Platform android -TestFilter "Category=Map" completed successfully. XHarness: Tests run: 9 Passed: 9 Inconclusive: 0 Failed: 0 Ignored: 0; MapElementOptionsLifecycleTests passed 7/7.

Failure analysis: Not failed. However, expert/self-review found a major design risk: direct static mapper calls bypass MapElementHandler.Mapper customizations, unlike the PR fix. Because of that extensibility regression, this candidate passes tests but is not demonstrably better than the PR's fix.

--- attempt 2 ---

try-fix-2 — MapHandler-owned option factories

Approach: Remove the PR helper and add private CreatePolylineOptions, CreatePolygonOptions, and CreateCircleOptions factories in MapHandler.Android.cs. The add paths build options directly from element interfaces and dispose them after GoogleMap.Add* returns.

Different from PR fix and try-fix-1: PR #35634 creates/cleans real temporary handlers. try-fix-1 used a lightweight handler adapter and static mapper methods. This candidate uses no map element handler/adapter at all and aligns initial add with the existing PolylineOnPropertyChanged/PolygonOnPropertyChanged/CircleOnPropertyChanged native update code.

Diff: See CustomAgentLogsTmp/PRState/35634/PRAgent/try-fix/attempt-2/fix.diff.

Test results: ✅ PASS — pwsh .github/skills/run-device-tests/scripts/Run-DeviceTests.ps1 -Project Controls -Platform android -TestFilter "Category=Map" completed successfully. XHarness: Tests run: 9 Passed: 9 Inconclusive: 0 Failed: 0 Ignored: 0; MapElementOptionsLifecycleTests passed 7/7.

Failure analysis: Not failed. Self-review found a major design risk: initial option construction no longer runs MapElementHandler.Mapper, so custom mapper extensions that the PR fix preserves would be skipped. It also duplicates map-element mapping logic in MapHandler. This candidate passes tests but is not demonstrably better than the PR fix.

📋 Report — Final Recommendation

Comparative Fix Report — PR #35634

Inputs

Issue: [Regression] [Android] [Maps] Map locks up after rendering 50 Polylines #20502 — Android maps can lock up after rendering many map elements due to temporary handler/options retention and Android GREF pressure.
Gate: PASSED — tests fail without the fix and pass with the PR fix.
Platform: Android.
Candidates compared: pr, pr-plus-reviewer, try-fix-1, and try-fix-2.

Candidate comparison

Rank	Candidate	Regression result	Assessment
1	`pr`	PASS	Best tradeoff. It fixes the retained temporary map-element handler/options lifetime while preserving the normal `MapElementHandler.Mapper` customization and DI pipeline. Cleanup is guaranteed with `finally`, and tests cover polyline, polygon, and circle handler detachment plus post-add native updates.
2	`pr-plus-reviewer`	PASS	Equivalent to `pr` because the expert reviewer produced no actionable inline findings or required sandbox patch. The only note was a non-blocking diagnostic-message wording cleanup for polygon/circle null exceptions.
3	`try-fix-1`	PASS	Avoids assigning `mapElement.Handler` by building options with a lightweight internal adapter and static mapper methods. This passes tests and strongly avoids the temporary-handler retention pattern, but it bypasses `MapElementHandler.Mapper` customizations that the PR preserves.
4	`try-fix-2`	PASS	Builds options directly in `MapHandler` factories and disposes them after `GoogleMap.Add*`. This passes tests and is simple, but duplicates mapping logic and also bypasses `MapElementHandler.Mapper`, making it a larger extensibility regression risk than the PR.

Winning candidate

Winner: pr

The submitted PR fix is the strongest candidate because it addresses the measured Android lifetime bug while retaining the existing handler/mapper extensibility contract. The two STEP 6a alternatives also pass regression tests, but both trade away mapper customization behavior or duplicate mapping logic, so they are lower-quality fixes despite passing. pr-plus-reviewer is not ranked above pr because the expert reviewer found no actionable patch to apply.

Notes

No candidate failed regression tests, so ranking is based on correctness, extensibility preservation, implementation risk, and maintainability.
The AddPins temporary-handler pattern remains a plausible follow-up area, but it is outside this PR's map-element scope and was not needed to resolve the gated regression.

## Summary - Fix Android map element addition so temporary map element handlers/options are disconnected and disposed after Google Maps consumes the options. - Covers polyline, polygon, and circle add paths without changing public APIs. - Adds Android device tests for temporary-handler cleanup and post-add native updates. Fixes #20502 ## Root Cause Android MapHandler.AddPolyline/AddPolygon/AddCircle created temporary MapElementHandler instances to build Google Maps options, but left those handlers attached to the MAUI map elements after GoogleMap.Add* consumed the options. Large MapElements workloads could retain many temporary handlers/options and drive severe GREF pressure. ## Validation - dotnet build Microsoft.Maui.BuildTasks.slnf - dotnet build src/Core/maps/src/Maps.csproj -f net10.0-android36.0 - dotnet build src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj -f net10.0-android -p:EmbedAssembliesIntoApk=true - Android focused map tests on Pixel 9 Pro XL API 36: 9 passed, 0 failed - Android clean full Controls.DeviceTests run on Pixel 9 Pro XL API 36: 962 run, 942 passed, 7 failed, 13 skipped. Remaining failures were unrelated existing/device-environment failures in Border/Shell/Label; MapElementOptionsLifecycleTests passed 7/7 inside the full run. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com>

@Vignesh-SF3580

## What's Coming .NET MAUI inflight/candidate introduces significant improvements across all platforms with focus on quality, performance, and developer experience. This release includes 153 commits with various improvements, bug fixes, and enhancements. ## Activityindicator - [Android] Fix CollectionView ActivityIndicator not animating after header height change by @Vignesh-SF3580 in #35358 <details> <summary>🔧 Fixes</summary> - [CollectionView items fail to update ActivityIndicator state after header height change](#33780) </details> ## Animation - [Android] Fix Shadow property affecting transform matrix. by @Shalini-Ashokan in #32962 <details> <summary>🔧 Fixes</summary> - [[Android] Applying Shadow property affects the properties in Visual Transform Matrix](#32731) </details> ## API - Add delegate-based alert dialog extensibility convention (no public API changes) by @Redth in #35095 <details> <summary>🔧 Fixes</summary> - [Alert/Dialog system (`DisplayAlert`, `DisplayActionSheet`, `DisplayPromptAsync`) needs a public extensibility point](#34104) </details> ## Blazor - [Android] Fix for BlazorWebView predictive back callback blocks Android back-to-home animation by @BagavathiPerumal in #35538 <details> <summary>🔧 Fixes</summary> - [[Android] BlazorWebView predictive back callback blocks Android back-to-home animation](#35397) </details> - [Android] Fix BlazorWebView back callback can swallow the first Back press when its callback is stale-enabled by @devanathan-vaithiyanathan in #35611 <details> <summary>🔧 Fixes</summary> - [[inflight regression] Android BlazorWebView back callback can swallow the first Back press when its callback is stale-enabled](#35573) </details> ## Border - [Windows] Fixed the ContentView clip is not updated when wrapping inside the Border by @Ahamed-Ali in #30408 <details> <summary>🔧 Fixes</summary> - [[Windows] ContentView clip is not updated when wrapping inside the Border](#30404) </details> - Fix Border.StrokeDashArray leaks dashed Borders when using a shared Application resource by @devanathan-vaithiyanathan in #35544 <details> <summary>🔧 Fixes</summary> - [`Border.StrokeDashArray` leaks dashed Borders when using a shared Application resource](#35492) </details> - [Windows] Border: Add AutomationPeer support by @Vignesh-SF3580 in #35577 <details> <summary>🔧 Fixes</summary> - [Adding AutomationPeers to Windows Borders](#27627) </details> - [Windows] Fixed BoxView improper rendering inside Border by @Dhivya-SF4094 in #28465 <details> <summary>🔧 Fixes</summary> - [[Windows] Issues with BoxView Placement Inside Border](#19668) </details> ## Button - Prevent NullReferenceException in LayoutButton by @GamesAgeddon in #35284 <details> <summary>🔧 Fixes</summary> - [NullReferenceException on iOS in Button.LayoutButton from WrapperView.LayoutSubviews](#31048) </details> - Fix TextColor null reset to restore platform defaults on iOS and Android by @Shalini-Ashokan in #35563 <details> <summary>🔧 Fixes</summary> - [[Windows, Android, iOS & Mac]Button TextColor does not restore to platform default when reset to null after dynamic update](#35513) </details> ## CollectionView - Fix CollectionView grid spacing updates for first row and column by @KarthikRajaKalaimani in #34527 <details> <summary>🔧 Fixes</summary> - [[MAUI] I2_Vertical grid for horizontal Item Spacing and Vertical Item Spacing - horizontally updating the spacing only applies to the second column](#34257) </details> - [MacCatalyst] Fix CollectionView Header/Footer Not Expanding to Content Width by @KarthikRajaKalaimani in #35213 <details> <summary>🔧 Fixes</summary> - [[MacOS][CV2] I8_View header and footer_Horizontal_View - Footer on the right doesn't adapt when resizing the window](#35113) </details> - [iOS/MacCatalyst] Fix IndicatorView not updating when IndicatorSize is changed to default value by @Shalini-Ashokan in #35215 <details> <summary>🔧 Fixes</summary> - [[iOS/MacCatalyst] IndicatorView does not update when IndicatorSize is dynamically changed to the default value](#35214) </details> - CollectionView selecteditem background lost if collectionview (or parent) IsEnabled changed. by @KarthikRajaKalaimani in #31540 <details> <summary>🔧 Fixes</summary> - [CollectionView selecteditem background lost if collectionview (or parent) IsEnabled changed.](#20615) </details> - [iOS/macOS] CollectionView: Fix FlowDirection not working on EmptyView by @Dhivya-SF4094 in #32674 <details> <summary>🔧 Fixes</summary> - [[iOS, MacOS] FlowDirection not working on EmptyView in CollectionView](#32404) - [[iOS, Mac] CollectionView EmptyViewTemplate content text is mirrored when FlowDirection is RightToLeft](#34522) </details> - Fix iOS CollectionView stale layout invalidations by @filipnavara in #35245 <details> <summary>🔧 Fixes</summary> - [[iOS] CollectionView tries to invalidate cells with invalid indexes](#35244) </details> - Fix Android grouped CollectionView header/footer rebind leak by @AdamEssenmacher in #35368 <details> <summary>🔧 Fixes</summary> - [Memory leak when scrolling a CollectionView with IsGrouped=true](#17698) </details> - [Windows] Fix for Item should scrolled based on the GroupHeaderTemplate by @SuthiYuvaraj in #28074 <details> <summary>🔧 Fixes</summary> - [I9_Scroll by object for grouped data - The group name is always pined at the top after clicking 'Scroll to Proboscis Monkey' button](#27922) </details> - [Android] Fix ScrollTo regression when IsGrouped true on CollectionView by @SubhikshaSf4851 in #35356 <details> <summary>🔧 Fixes</summary> - [[10.0.60] ScrollTo(0) not working anymore on CollectionView when IsGrouped="True"](#35313) </details> - [Android] Fix CollectionView scrolling performance regression by @devanathan-vaithiyanathan in #35379 <details> <summary>🔧 Fixes</summary> - [[10.0.60] CollectionView scrolling performance regression](#35344) </details> - Optimize parent dynamic resource refresh by @AdamEssenmacher in #35408 <details> <summary>🔧 Fixes</summary> - [Memory usage increases when scrolling collectionview if resources count is more than 191](#22053) </details> - Fix CI failure for CollectionView Scrolling Feature Tests due to PR #35379 by @devanathan-vaithiyanathan in #35536 - [iOS & Mac] CarouselViewController2 leaks on iOS/MacCatalyst due to unremoved orientation notification observer by @SubhikshaSf4851 in #35532 <details> <summary>🔧 Fixes</summary> - [CarouselViewController2 leaks on iOS/MacCatalyst due to unremoved orientation notification observer](#35472) </details> - Fix CollectionView.SelectedItems leaks popped views when bound to a retained ObservableCollection by @HarishwaranVijayakumar in #35558 <details> <summary>🔧 Fixes</summary> - [`CollectionView.SelectedItems` leaks popped views when bound to a retained `ObservableCollection`](#35497) </details> - Fix for Android - Dynamic Updates to CollectionView Header/Footer and Templates Are Not Displayed by @SuthiYuvaraj in #28904 <details> <summary>🔧 Fixes</summary> - [Android - Dynamic Updates to CollectionView Header/Footer and Templates Are Not Displayed](#28676) </details> - [Windows] Fix CarouselView EmptyView display when filtering to zero items by @Shalini-Ashokan in #29247 <details> <summary>🔧 Fixes</summary> - [[Windows] [Scenario Day] EmptyView using Template displayed at the same time as the content](#7150) </details> - [Android/iOS] Fix IsEnabled=False on CollectionView not working by @devanathan-vaithiyanathan in #27749 <details> <summary>🔧 Fixes</summary> - [[iOS/Android] CollectionView IsEnabled Not Working](#27770) </details> - Fix CarouselView.Loop property does not update dynamically and fails to maintain the scroll position when the loop value is changed at runtime by @devanathan-vaithiyanathan in #29527 <details> <summary>🔧 Fixes</summary> - [[Android] CarouselView.Loop = false causes crash on Android when changed at runtime](#29411) - [Loop Binding in CarouselView Not Updating Dynamically at Runtime](#29449) </details> - [iOS / Mac] Fix CollectionView.ScrollTo(index) silently failing whenIsGrouped="True" by @Dhivya-SF4094 in #35609 <details> <summary>🔧 Fixes</summary> - [CollectionView.ScrollTo(index) doesn't work correctly when IsGrouped="True" on iOS, MacCatalyst, and Windows](#35326) </details> - Fix Android nested carousel scrolling by @AdamEssenmacher in #35656 <details> <summary>🔧 Fixes</summary> - [Vertical scrolling not working for CarouselView and CustomLayouts](#7814) </details> - [Inflight regression] Fixed Test failures ModalTabbedPagePushAsyncShouldOverlayBottomNavigationView and GroupedCollectionViewScrollToIndexScrollsToCorrectItem by @Dhivya-SF4094 in #35823 - Fix CarouselView tests fail in June 8 Candidate by @devanathan-vaithiyanathan in #35825 ## Core - Reduce allocations on AnimationManager by @pictos in #35612 <details> <summary>🔧 Fixes</summary> - [AnimationManager is allocating a lot](#35654) </details> ## Core Lifecycle - Fix device test memory by @pictos in #35487 <details> <summary>🔧 Fixes</summary> - [Memory leak Device.Test pass with false positive](#35485) </details> ## Datepicker - Fix MacCatalyst DatePicker focus handling by @AdamEssenmacher in #35553 <details> <summary>🔧 Fixes</summary> - [[mauipalooza] DatePicker focus only works first time](#5947) </details> ## DateTimePicker - [Android] Fix DatePicker dialog dismisses after the device is rotated by @HarishwaranVijayakumar in #34980 <details> <summary>🔧 Fixes</summary> - [[Android] [Regression] DatePicker dialog dismisses after the device is rotated](#34973) </details> ## Docs - doc: Add paragraph to README.md explaining how to fetch the `maui` project templates by @durandt in #34561 ## Drawing - [Android] Fix LinearGradientBrush rendering as opaque black box by @SubhikshaSf4851 in #35299 <details> <summary>🔧 Fixes</summary> - [[Regression] LinearGradientBrush broken on Android in 10.0.60](#35280) - [10.0.60 breaks transparency on Brushes (on Android?)](#35354) </details> - Fix polygon points collection handler leak by @AdamEssenmacher in #35526 <details> <summary>🔧 Fixes</summary> - [PolygonHandler and PolylineHandler leak when Points is replaced before disconnect](#35387) </details> ## Editor - [iOS] Fix Editor losing scrollability after rotation when CharacterSpacing is applied by @Vignesh-SF3580 in #35309 <details> <summary>🔧 Fixes</summary> - [[.NET 10][iOS] D2 - Editor can't be scrolled after rotating simulator.](#35114) </details> - [Inflight/Candidate][iOS & Mac] Fix for Editor height inconsistency when VerticalTextAlignment is Center or End on iOS and MacCatalyst by @BagavathiPerumal in #35662 <details> <summary>🔧 Fixes</summary> - [[MAUI] D13_Customize_Text_Alignment - Text Editor Height is not consistent](#35615) </details> ## Entry - [iOS/Mac] Fix Entry clear button retaining tint color after TextColor is reset to null by @SyedAbdulAzeemSF4852 in #35177 <details> <summary>🔧 Fixes</summary> - [[iOS/Mac]Entry ClearButtonVisibility color does not reset when TextColor is set to null](#35076) </details> - [iOS/MacCatalyst] Fix Entry clear button appearing dimmed compared to TextColor by @SyedAbdulAzeemSF4852 in #35541 <details> <summary>🔧 Fixes</summary> - [[MacCatalyst] [Entry] ClearButtonVisibility color appears dimmed compared to TextColor](#35517) </details> - Fix pill-shaped focus ring on macOS 26 by @Dhivya-SF4094 in #35393 <details> <summary>🔧 Fixes</summary> - [.Net 10 Picker item not centered and wrong focus outline of Entry on Mac](#34899) </details> - Fix Entry select all text on refocus not working on WinUI by @kubaflo in #35383 ## Essentials - [Android] Fix Capture video crashes after stopping recording on Android 12 by @HarishwaranVijayakumar in #35638 <details> <summary>🔧 Fixes</summary> - [Capture video crashes after stopping recording on Android 12](#28891) </details> - [Essentials] Browser.OpenAsync(External): drop visibility-filtered ResolveActivity pre-check by @Kebechet in #35652 <details> <summary>🔧 Fixes</summary> - [Browser.OpenAsync(External) on Android throws FeatureNotSupportedException for verified App Link owner URLs even with documented <queries> fix applied](#35651) </details> ## Essentials Texttospeech - [Mac, iOS, Windows] Fix for inconsistent Text-to-Speech rate behavior by @HarishwaranVijayakumar in #32850 <details> <summary>🔧 Fixes</summary> - [[Essentials] TTS rate](#32492) </details> ## Flyoutpage - [iOS/Mac] Fix FlyoutPage RTL FlowDirection is not working by @devanathan-vaithiyanathan in #34831 <details> <summary>🔧 Fixes</summary> - [[iOS/Mac] FlyoutPage RTL FlowDirection is not working properly](#34830) </details> - [Android] Fix for Android 16 Back button is not working after command from FlyoutPage by @BagavathiPerumal in #35196 <details> <summary>🔧 Fixes</summary> - [Android: BackButton on Android 16 not working after command from FlyOutPage](#33508) </details> ## Gestures - Fix DragGestureRecognizer.DropCompleted event not firing in Android platform by @KarthikRajaKalaimani in #35179 <details> <summary>🔧 Fixes</summary> - [[Android] DragGestureRecognizer.DropCompleted event not firing](#17554) </details> - Windows: Ensure layouts without background participate in hit testing by @jpd21122012 in #34364 <details> <summary>🔧 Fixes</summary> - [[Windows] TapGestureRecognizer does NOT work on a ContentView without Background](#32279) </details> - [iOS] Fix VoiceOver dropping child labels on layouts with SemanticProperties.Hint or TapGestureRecognizer by @Vignesh-SF3580 in #35590 <details> <summary>🔧 Fixes</summary> - [[iOS] VoiceOver does not correctly describe View with GestureRecognizers](#34380) </details> ## Hybridwebview - Fix RemovePossibleQueryString to also strip URL fragments by @kubaflo in #35551 <details> <summary>🔧 Fixes</summary> - [HybridWebViewQueryStringHelper.RemovePossibleQueryString removes '?' but not other special characters e.g. '#'](#31472) </details> - [Revert] - [Windows] Fix WebView blank rendering when used with HybridWebView by @SubhikshaSf4851 in #35814 ## Image - Avoid image source layout invalidation for fixed-size views by @AdamEssenmacher in #35369 <details> <summary>🔧 Fixes</summary> - [Image source swaps thrash layout under fixed constraints, tanking frame rate when scrolling virtualized collections](#32457) </details> - [Windows] Fix Image layout inconsistency caused by async decode race in GetDesiredSize by @praveenkumarkarunanithi in #34699 <details> <summary>🔧 Fixes</summary> - [[Windows] Image cropping produces inconsistent results when window is minimized or resized](#32393) </details> - [Testing] Include more testing around Windows Image Aspect recent fixes by @kubaflo in #35620 <details> <summary>🔧 Fixes</summary> - [[Testing] Include more testing around Windows Image Aspect recent fixes](#31686) </details> - Revert PR #30068 — Fix FontImageSource centering regression on Windows by @Shalini-Ashokan in #35642 <details> <summary>🔧 Fixes</summary> - [[Windows] Image with FontImageSource is not centered and gets clipped when WidthRequest/HeightRequest equals FontImageSource Size](#35618) </details> - [Android] Fix screenshot from WebView content not working by @kubaflo in #35384 <details> <summary>🔧 Fixes</summary> - [[Android] Loading the captured screenshot from webview content to Image control does not visible](#30010) </details> ## Label - Improve label mapping performance and ensure complete coverage including ToPlatform and subsequent property changes by @Tamilarasan-Paranthaman in #31159 - Fix for Label.FormattedText leaks labels when shared FormattedString is stored in Application.Resources by @BagavathiPerumal in #35582 <details> <summary>🔧 Fixes</summary> - [`Label.FormattedText` leaks labels when shared `FormattedString` is stored in `Application.Resources`](#35495) </details> - [iOS] Fix Label Span formatting test failures on candidate branch by @Vignesh-SF3580 in #35815 ## Layout - [iOS, Mac] Fix Item spacing not properly applied between items in Horizontal LinearItemsLayout by @Dhivya-SF4094 in #35445 <details> <summary>🔧 Fixes</summary> - [[CollectionView2] Item spacing not properly applied between items in Horizontal LinearItemsLayout](#35429) </details> - [Windows] Add Automation Id support for Layouts. by @SubhikshaSf4851 in #35562 <details> <summary>🔧 Fixes</summary> - [[Windows] AutomationId does not work for ContentView, Layouts and controls that inherit them](#4715) </details> - Avoid layout diagnostics allocations without listeners by @AdamEssenmacher in #35475 <details> <summary>🔧 Fixes</summary> - [MAUI 10 layout diagnostics no-consumer path is not zero-allocation](#35473) </details> - [Windows/Android] FlexLayout: Fix wrap misalignment due to floating-point precision by @SuthiYuvaraj in #31341 <details> <summary>🔧 Fixes</summary> - [FlexLayout Wrap Misalignment with Dynamically-Sized Buttons in .NET MAUI](#30957) </details> ## Listview - Fix Binding for ListView.IsRefreshing by @bill2004158 in #28516 <details> <summary>🔧 Fixes</summary> - [Bind ListView.IsRefreshing is not work.](#28514) </details> ## Map - Fix iOS/Catalyst MapPool retention with MapElements by @AdamEssenmacher in #35480 <details> <summary>🔧 Fixes</summary> - [iOS/Mac Catalyst MapHandler leaks MAUI Map views and MapElements through MapPool](#35479) </details> - Fix Android map view lifecycle cleanup by @AdamEssenmacher in #35476 <details> <summary>🔧 Fixes</summary> - [Navigating to a page with Maps multiple times Increase RAM Usage but doesn't reduce it back after navigating back](#15257) </details> - Fix Android map element options retention by @AdamEssenmacher in #35634 <details> <summary>🔧 Fixes</summary> - [[Regression] [Android] [Maps] Map locks up after rendering 50 Polylines](#20502) </details> ## Menubar - [MacCatalyst] Fix KeyboardAccelerator with Cmd+Shift modifiers breaks entire MenuBarItem on Mac Catalyst by @KarthikRajaKalaimani in #35318 <details> <summary>🔧 Fixes</summary> - [[Bug] KeyboardAccelerator with Cmd+Shift modifiers breaks entire MenuBarItem on Mac Catalyst](#35279) </details> ## Navigation - [iOS, Mac] Fix OnBackButtonPressed not invoked for NavigationPage and Shell by @Dhivya-SF4094 in #35072 <details> <summary>🔧 Fixes</summary> - [On Screen Back Button Does Not Fire OnBackButtonPressed in Android](#9095) - [ContentPage's OnBackButtonPressed not invoked on iOS and MacCatalyst](#8296) </details> - Fix Android stale ContainerView root leak by @AdamEssenmacher in #35372 <details> <summary>🔧 Fixes</summary> - [Android: Stale ContainerView retains replaced FlyoutPage graph](#35371) </details> - [Android] Fix for predictive back-to-home animation blocked by unconditional back callback registration by @BagavathiPerumal in #35223 <details> <summary>🔧 Fixes</summary> - [OnBackInvokedCallbacks block back-to-home animation](#34594) - [Migrate to OnBackPressedCallback](#24752) </details> - Revert [Android, iOS] - Flyout icon should remain visible when a page is pushed onto a NavigationPage or Shell page with the back button disabled. by @praveenkumarkarunanithi in #35604 ## Picker - [iOS] Fix Picker CharacterSpacing lost after item selection when Title is set by @SyedAbdulAzeemSF4852 in #34974 <details> <summary>🔧 Fixes</summary> - [[iOS] Picker loses CharacterSpacing after item selection when Title is set](#34971) </details> - [iOS] Fix Picker CharacterSpacing ignored on initial load by @SyedAbdulAzeemSF4852 in #34957 <details> <summary>🔧 Fixes</summary> - [[iOS] Picker ignores CharacterSpacing on initial load](#34955) </details> - [Windows] Fix for Picker CharacterSpacing Not Being Applied to Title and Dropdown Items by @SyedAbdulAzeemSF4852 in #30612 <details> <summary>🔧 Fixes</summary> - [[Windows] Picker CharacterSpacing property not applied to Title and PickerItems text](#30464) </details> - Fix Picker SelectedIndex deferred initialization by @AdamEssenmacher in #35629 <details> <summary>🔧 Fixes</summary> - [Picker Attribute "SelectedIndex" Not being respected on page load on Android?](#9150) </details> ## Progressbar - Fix iOS ProgressBar bounding box by @AdamEssenmacher in #35507 <details> <summary>🔧 Fixes</summary> - [[iOS] ProgressBar and Label don't correctly obey height and width at the core level](#7935) </details> ## RadioButton - [Windows, Android] Fix Border Color and Border Width Not applying for Radio Button by @HarishwaranVijayakumar in #35616 <details> <summary>🔧 Fixes</summary> - [[Windows, Android] Border Color and Border Width Not applying for Radio Button.](#35587) </details> - [inflight/current] Fixes a CS0111 build failure in RadioButton.cs caused by a duplicate OnPropertyChanged override by @HarishwaranVijayakumar in #35631 - Revert - Fix TalkBack not correctly narrating RadioButtons with Content by @devanathan-vaithiyanathan in #35625 <details> <summary>🔧 Fixes</summary> - [[Android] MissingMethodException AccessibilityNodeInfoCompat.set_Checked(bool) on 10.0.70 due to AndroidX.Core 1.17 breaking change](#35584) </details> ## Refreshview - [Windows] Fix RefreshView IsRefreshing property not working while binding by @devanathan-vaithiyanathan in #34845 <details> <summary>🔧 Fixes</summary> - [[Windows] RefreshView IsRefreshing property not working while binding](#30535) </details> - [Android] Fix for RefreshView triggering pull-to-refresh when scrolling inside a WebView with internal scrollable content by @BagavathiPerumal in #34614 <details> <summary>🔧 Fixes</summary> - [[Android] RefreshView triggers pull-to-refresh immediately when scrolling up inside a WebView](#33510) </details> ## SafeArea - [Android] Fix bottom safe area padding dropping to zero when keyboard is shown by @praveenkumarkarunanithi in #35084 <details> <summary>🔧 Fixes</summary> - [[Android] Bottom insets issues when keyboard is shown.](#32871) </details> - Gate SafeArea inset listeners in recycler items by @AdamEssenmacher in #35664 <details> <summary>🔧 Fixes</summary> - [[10.0.60] CollectionView scrolling performance regression](#35344) </details> ## ScrollView - [Windows] Fix COMException when restoring a ScrollView as ContentPage.Content after swapping it out by @Vignesh-SF3580 in #35360 <details> <summary>🔧 Fixes</summary> - [COMException when clone a page's content to a object and set it back later in mainthread on Windows](#35277) </details> - Fix - ScrollView.ScrollToAsync(x, y, animated) doesn't work when called from Page.OnAppearing by @Shalini-Ashokan in #35395 <details> <summary>🔧 Fixes</summary> - [[iOS] ScrollView.ScrollToAsync(x, y, animated) doesn't work when called from Page.OnAppearing](#31177) </details> ## Searchbar - [Android] Fix SearchBar IME full-screen extract mode in landscape orientation by @SubhikshaSf4851 in #35197 <details> <summary>🔧 Fixes</summary> - [[Android] Investigate SearchBar presentation in horizontal screen orientation ](#14708) </details> - [iOS 26] Fix SearchBar layout spacing issues for small HeightRequest values by @devanathan-vaithiyanathan in #35347 <details> <summary>🔧 Fixes</summary> - [Spacing problem with maui 10.0.60 iOS](#35286) </details> ## SearchBar - [Windows] Fix SearchHandler does not focus when ShowSoftInputAsync is called by @praveenkumarkarunanithi in #35079 <details> <summary>🔧 Fixes</summary> - [[Windows] SearchHandler.ShowSoftInputAsync() does not focus the SearchHandler](#34930) </details> ## Shell - Fix Android layout jump when navigating with IME open and NavBarIsVisible=false by @jpd21122012 in #34621 <details> <summary>🔧 Fixes</summary> - [Shell page without NavBar jumping when navigating with keyboard open](#34584) </details> - [Android] Add defensive not null check to SearchHandlerAppearanceTracker.FocusChange by @Transis-Felipe in #29939 - [Android] Fix for Shell colors change before navigation completes on Android in .NET 10 by @BagavathiPerumal in #35295 <details> <summary>🔧 Fixes</summary> - [Shell colors change before navigation completes on Android in .NET 10](#35060) </details> - [Windows] Fix Shell FlyoutItem not taking full width by @SubhikshaSf4851 in #35131 <details> <summary>🔧 Fixes</summary> - [MAUI WinUI Grids don't render properly in flyout menu](#19542) - [[Windows] [.NET 8 RC2] FlyoutItem Backgroundcolor Is not fully displaying](#18238) </details> - [Android, iOS, Catalyst] Fix SearchHandler.BackgroundColor cannot be reset to null by @HarishwaranVijayakumar in #35224 <details> <summary>🔧 Fixes</summary> - [[Android, iOS, Catalyst] SearchHandler.BackgroundColor cannot be reset to null](#35088) </details> - Fix for ApplyQueryAttributes being called on non-destination pages during back navigation by @BagavathiPerumal in #35392 <details> <summary>🔧 Fixes</summary> - [ApplyQueryAttributes gets called for not activated (navigated to) page on back](#35183) </details> - [Android] Fix Shell flyout background to follow Material 3 theme colors by @SyedAbdulAzeemSF4852 in #35148 <details> <summary>🔧 Fixes</summary> - [[Android] Shell Flyout ignores Material 3 surface color when UseMaterial3 is enabled](#35147) </details> - [Android] Fix Shell.FlyoutHeader background incorrect by @SyedAbdulAzeemSF4852 in #35489 <details> <summary>🔧 Fixes</summary> - [[Android] Shell.FlyoutHeader background is incorrect](#35416) </details> - [iOS/MacCatalyst] Fix Shell.BackgroundColor not applied to bottom TabBar by @Shalini-Ashokan in #35545 <details> <summary>🔧 Fixes</summary> - [[MacCatalyst] Shell.BackgroundColor not applied to bottom TabBar](#35380) - [[Catalyst] Shell.TabBarBackgroundColor is not applied](#35381) </details> - [Android] Fix Shell FlyoutIcon tint loss after navigation by @SyedAbdulAzeemSF4852 in #35561 <details> <summary>🔧 Fixes</summary> - [[Android] The flyout icon loses colours](#35390) </details> - [iOS] Fix Shell - opened keyboard on modal page shifts parent page/frame behind modal after update to 10.0.60 by @KarthikRajaKalaimani in #35559 <details> <summary>🔧 Fixes</summary> - [[iOS] Shell - opened keyboard on modal page shifts parent page/frame behind modal after update to 10.0.60](#35401) </details> - Fix intermediate pages not receiving query parameters in multi-page Shell navigation by @mattleibow in #35432 <details> <summary>🔧 Fixes</summary> - [Shell GoToAsync: no way to pass query parameters to intermediate pages in multi-segment navigation](#35107) </details> - [Windows] Fix Shell title bar overlap with window controls in RTL mode by @Shalini-Ashokan in #33109 <details> <summary>🔧 Fixes</summary> - [[Windows] Binding RTL FlowDirection in Shell causes Flyout MenuIcon and native window controls to overlap](#32476) </details> - [macOS] Fix IsEnabled property false not working on MenuBarItem by @devanathan-vaithiyanathan in #35546 <details> <summary>🔧 Fixes</summary> - [[macOS] IsEnabled property false not working on MenuBarItem](#34038) </details> - Fix Android Shell top inset when nav bar is hidden by @ne0rrmatrix in #35555 <details> <summary>🔧 Fixes</summary> - [wrong statusbar height when Android device has a notch](#35103) </details> - Fix Changing Content property of ShellContent doesn't change visual content by @devanathan-vaithiyanathan in #34630 <details> <summary>🔧 Fixes</summary> - [Changing Content property of ShellContent doesn't change visual content. ](#12669) </details> - Fixed a NullReferenceException when starting application with empty shell on Windows by @Shalini-Ashokan in #28879 <details> <summary>🔧 Fixes</summary> - [NullReferenceException when starting application with empty shell on Windows](#21562) - [Using SelectionChangedCommand with CollectionView in Shell.FlyoutContent results in Win32 Unhandled Exception](#10041) </details> ## Slider - [iOS] Slider: Scale ThumbImageSource to match default thumb size by @NirmalKumarYuvaraj in #34184 <details> <summary>🔧 Fixes</summary> - [[Slider] MAUI Slider thumb image is big on android](#13258) </details> ## Stepper - Fix iOS 26 Stepper overlap in landscape by @AdamEssenmacher in #35374 <details> <summary>🔧 Fixes</summary> - [[.NET10] D10-The number and buttons overlap after rotating the simulator.](#35211) </details> ## SwipeView - Fix SwipeViews with invoked properties crash the app in Release mode by @BagavathiPerumal in #35208 <details> <summary>🔧 Fixes</summary> - [[iOS/Catalyst] Swipeviews with invoked properties crash the app in Release](#18055) </details> - Fix SwipeItemView command leak by @AdamEssenmacher in #35510 <details> <summary>🔧 Fixes</summary> - [`SwipeItemView.Command` leaks row views and command parameters through `CanExecuteChanged`](#35498) </details> - [iOS/Android] Fix SwipeItem.IsVisible not refreshing native swipe items when binding changes by @SyedAbdulAzeemSF4852 in #35217 <details> <summary>🔧 Fixes</summary> - [SwipeItem.IsVisible doesn't properly refresh the native swipe items when the binding value changes dynamically](#34832) </details> - Fix SwipeView memory leak when SwipeItems are reused or replaced by @Vignesh-SF3580 in #35539 <details> <summary>🔧 Fixes</summary> - [SwipeView leaks when SwipeItems are reused or replaced](#35481) </details> - Fix SwipeItem IconImageSource color handling and rendering across platforms by @Shalini-Ashokan in #35632 <details> <summary>🔧 Fixes</summary> - [[Android] SwipeItem IconImageSource should allow more configuration](#23074) </details> ## Switch - [Android/Windows] Fix RadioButton gradient not clearing when switching background by @Shalini-Ashokan in #34997 <details> <summary>🔧 Fixes</summary> - [RadioButton Background does not reset when set to null at runtime](#34993) </details> - [Windows] Fix "PlatformView cannot be null here" exception during handler disconnect by @kubaflo in #35314 <details> <summary>🔧 Fixes</summary> - ["PlatformView cannot be null here" Exception in Switch control [Windows]](#27101) </details> - [iOS 26] Fix Switch ThumbColor and OffColor not applied on initial load by @SyedAbdulAzeemSF4852 in #35400 <details> <summary>🔧 Fixes</summary> - [iOS 26 Switch default color for Off and On is incorrect + Off Color is not applied at start + Thumb Colors is not applied](#35257) </details> - [Android] Fix AppBar flicker on CheckBox/Switch toggle with Material 3 by @Dhivya-SF4094 in #35181 <details> <summary>🔧 Fixes</summary> - [[Android] AppBar flicker while changing the CheckBox or Switch state after scrolling in Material 3](#35180) </details> - [Android] Fix Switch Shadow Does Not Follow Thumb when Toggle On or Off by @Dhivya-SF4094 in #35623 <details> <summary>🔧 Fixes</summary> - [[Android] Switch Shadow Does Not Follow Thumb when Toggle On or Off](#30046) </details> ## TabbedPage - [Android] Fix TabbedPage truncating tab titles instead of scrolling by @Shalini-Ashokan in #35086 <details> <summary>🔧 Fixes</summary> - [Maui migrating Xamarin to Maui - Tabbed Page Scroll Issue - Tabs are not scrolling](#16470) </details> - [Android] Fix BottomNavigationView remaining visible for TabbedPage inside modal NavigationPage after PushAsync by @Dhivya-SF4094 in #35359 <details> <summary>🔧 Fixes</summary> - [Android TabbedPage inside Modal Navigation does not overlay BottomNavigationView after PushAsync in .NET MAUI 10.0.60](#35331) </details> - [Android & iOS] TabbedPage leaks with shared GradientBrush. by @SubhikshaSf4851 in #35543 <details> <summary>🔧 Fixes</summary> - [TabbedPage leaks renderer/manager when BarBackground uses shared GradientBrush resource](#35469) </details> ## Templates - Bumps Syncfusion.Maui.Toolkit dependency to version 1.0.10 by @PaulAndersonS in #35608 ## Toolbar - Fix Android app bar inset background coloring by @ne0rrmatrix in #35601 <details> <summary>🔧 Fixes</summary> - [Android Edge-to-Edge: Shell and NavigationPage Top Bar colour is not used for status bar.](#35568) </details> ## Tooling - Add default .gitignore to MAUI project templates by @davidortinau in #34862 <details> <summary>🔧 Fixes</summary> - [Add a gitignore file to the Maui template in VS 2022](#4131) </details> - Fix: Propagate AdditionalProperties from ProjectReference in ResizetizeCollectItems by @mattleibow in #35575 <details> <summary>🔧 Fixes</summary> - [Resizetizer GetMauiItems does not propagate ProjectReference AdditionalProperties](#35574) </details> ## WebView - [Windows] Fix WebView blank rendering when used with HybridWebView by @SubhikshaSf4851 in #35092 <details> <summary>🔧 Fixes</summary> - [[Windows] WebView Regression from NET9 to NET10](#34558) </details> - Fix AOT integration test failures: suppress IL3050/IL2026 for HybridWebViewHandler in AddControlsHandlers by @mattleibow via @Copilot in #34868 - Fix Android activity result callback leak by @AdamEssenmacher in #35436 <details> <summary>🔧 Fixes</summary> - [Android WebView file chooser callbacks leak via ActivityResultCallbackRegistry](#35405) </details> - [Windows] Fix WebView Does Not Inherit App Theme by @devanathan-vaithiyanathan in #35037 <details> <summary>🔧 Fixes</summary> - [WebView on Windows Does Not Inherit App Theme](#34823) </details> - Fix for WebView leaks when reusing a shared WebViewSource by @BagavathiPerumal in #35524 <details> <summary>🔧 Fixes</summary> - [WebView leaks when reusing a shared WebViewSource](#35483) </details> - Destroy Android WebView on handler disconnect by @AdamEssenmacher in #35552 <details> <summary>🔧 Fixes</summary> - [Right way to dispose page with WebView](#18021) </details> ## Xaml - Fix: Enable VisualStateManager to set Style property dynamically by @Shalini-Ashokan in #33389 <details> <summary>🔧 Fixes</summary> - [Setting the `Style` property using the `VisualStateManager` within a Style resource does not work](#17175) </details> - Fix Implicit parameter conversion from integer to byte fails with source generated XAML by @KarthikRajaKalaimani in #35444 <details> <summary>🔧 Fixes</summary> - [Implicit parameter conversion from integer to byte fails with source generated XAML](#35396) </details> <details> <summary>🔧 Infrastructure (3)</summary> - Fix: Build fails when appicon is an empty (but valid) SVG by @Shalini-Ashokan in #35305 <details> <summary>🔧 Fixes</summary> - [Build fails when appicon is an empty (but valid) svg after upgrade to 10.0.60](#35293) </details> - [inflight/current] Fix CS0111 duplicate GetNativeCharacterSpacing in PickerHandlerTests.iOS by @SyedAbdulAzeemSF4852 in #35419 - Update WinAppSDK to 1.8.260508005 by @kubaflo in #35678 </details> <details> <summary>🧪 Testing (3)</summary> - Backport Test Fixes and Snapshots from SR to Inflight Branch by @Tamilarasan-Paranthaman in #35499 - Fix hardcoded version of Microsoft.DotNet.XHarness.TestRunners.Xunit in test projects by @akoeplinger in #29905 - [Testing] Fixed Build error on inflight/ candidate PR 35716 by @HarishKumarSF4517 in #35730 </details> <details> <summary>🏠 Housekeeping (1)</summary> - [HouseKeeping] Fix inconsistant namespace in HostApp by @NirmalKumarYuvaraj in #35210 </details> <details> <summary>📦 Other (8)</summary> - Add .cab and ReconnectModal.razor.js to signing config by @jesuszarate in #35026 - Fix typo in Clipboard.shared.cs by @Deadpikle in #35316 - Fix single modifier for NSMenuItem accelerators by @jeremy-visionaid in #35351 - Avoid unnecessary LINQ enumerations by @jeremy-visionaid in #35272 - [Testing] Replace retryDelay with retryTimeout in UI tests by @kubaflo in #35367 - Replace JavaFinalize() with Dispose(bool) in GenericAnimatorListener by @jonathanpeppers in #35548 - Fix incorrect SDK provisioning commands in integration-tests instructions by @davidnguyen-tech in #34992 - Fix VisualElement.ChangeVisualState() gets stuck in Selected state by @Dhivya-SF4094 in #35421 <details> <summary>🔧 Fixes</summary> - [VisualElement's ChangeVisualState gets stuck in Selected state](#35399) </details> </details> <details> <summary>📝 Issue References</summary> Fixes #4131, Fixes #4715, Fixes #5947, Fixes #7150, Fixes #7814, Fixes #7935, Fixes #8296, Fixes #9095, Fixes #9150, Fixes #10041, Fixes #12669, Fixes #13258, Fixes #14708, Fixes #15257, Fixes #16470, Fixes #17175, Fixes #17554, Fixes #17698, Fixes #18021, Fixes #18055, Fixes #18238, Fixes #19542, Fixes #19668, Fixes #20502, Fixes #20615, Fixes #21562, Fixes #22053, Fixes #23074, Fixes #24752, Fixes #27101, Fixes #27627, Fixes #27770, Fixes #27922, Fixes #28514, Fixes #28676, Fixes #28891, Fixes #29411, Fixes #29449, Fixes #30010, Fixes #30046, Fixes #30404, Fixes #30464, Fixes #30535, Fixes #30957, Fixes #31048, Fixes #31177, Fixes #31472, Fixes #31686, Fixes #32279, Fixes #32393, Fixes #32404, Fixes #32457, Fixes #32476, Fixes #32492, Fixes #32731, Fixes #32871, Fixes #33508, Fixes #33510, Fixes #33780, Fixes #34038, Fixes #34104, Fixes #34257, Fixes #34380, Fixes #34522, Fixes #34558, Fixes #34584, Fixes #34594, Fixes #34823, Fixes #34830, Fixes #34832, Fixes #34899, Fixes #34930, Fixes #34955, Fixes #34971, Fixes #34973, Fixes #34993, Fixes #35060, Fixes #35076, Fixes #35088, Fixes #35103, Fixes #35107, Fixes #35113, Fixes #35114, Fixes #35147, Fixes #35180, Fixes #35183, Fixes #35211, Fixes #35214, Fixes #35244, Fixes #35257, Fixes #35277, Fixes #35279, Fixes #35280, Fixes #35286, Fixes #35293, Fixes #35313, Fixes #35326, Fixes #35331, Fixes #35344, Fixes #35354, Fixes #35371, Fixes #35380, Fixes #35381, Fixes #35387, Fixes #35390, Fixes #35396, Fixes #35397, Fixes #35399, Fixes #35401, Fixes #35405, Fixes #35416, Fixes #35429, Fixes #35469, Fixes #35472, Fixes #35473, Fixes #35479, Fixes #35481, Fixes #35483, Fixes #35485, Fixes #35492, Fixes #35495, Fixes #35497, Fixes #35498, Fixes #35513, Fixes #35517, Fixes #35568, Fixes #35573, Fixes #35574, Fixes #35584, Fixes #35587, Fixes #35615, Fixes #35618, Fixes #35651, Fixes #35654 </details> **Full Changelog**: main...inflight/candidate

PureWeen and others added 5 commits May 21, 2026 16:04

Add version 10.0.70 to bug report template (dotnet#35569)

4408e3e

Fix Android map element options retention

f51bd19

dotnet-policy-service Bot added the community ✨ Community Contribution label May 27, 2026

github-actions Bot added area-controls-map Map / Maps platform/android labels May 27, 2026

AdamEssenmacher marked this pull request as ready for review May 27, 2026 08:04

This was referenced May 27, 2026

[PR Review Queue] 2026-05-27 #35636

Closed

[PR Review Queue] 2026-05-27 PureWeen/maui#81

Closed

MauiBot added s/agent-fix-pr-picked AI could not beat the PR fix - PR is the best among all candidates s/agent-reviewed PR was reviewed by AI agent workflow (full 4-phase review) labels May 27, 2026

This was referenced May 28, 2026

[repo-status] Daily Repo Status — May 28, 2026 #35646

Closed

[repo-status] Daily Repo Status — May 28, 2026 PureWeen/maui#85

Closed

kubaflo changed the base branch from main to inflight/current May 28, 2026 08:46

kubaflo merged commit 6706ac2 into dotnet:inflight/current May 28, 2026
8 of 9 checks passed

github-actions Bot added this to the .NET 10.0 SR8 milestone May 28, 2026

AdamEssenmacher deleted the issue-20502 branch May 31, 2026 09:31

github-actions Bot mentioned this pull request Jun 1, 2026

[repo-status] Daily Repo Status — June 1, 2026 #35680

Closed

sheiksyedm modified the milestones: .NET 10 SR8, .NET 10 SR9 Jun 18, 2026

PureWeen mentioned this pull request Jul 6, 2026

June 8th, Candidate #35716

Merged

kubaflo mentioned this pull request Jul 6, 2026

July 13th, Candidate #36411

Open

github-actions Bot locked and limited conversation to collaborators Jul 19, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix Android map element options retention - #35634

Fix Android map element options retention#35634
kubaflo merged 5 commits into
dotnet:inflight/currentfrom
AdamEssenmacher:issue-20502

AdamEssenmacher commented May 27, 2026

github-actions Bot commented May 27, 2026

dotnet-policy-service Bot commented May 27, 2026

kubaflo commented May 27, 2026

MauiBot commented May 27, 2026

Gate Result: ✅ PASSED

🔍 Regression Cross-Reference

Key Findings

Code Review Summary

Fix Candidates

Code Review — PR #35634

Independent Assessment

Reconciliation with PR Narrative

Findings

⚠️ Warning — Error messages are now semantically incorrect after refactor

💡 Suggestion — `AddPins` has the identical handler-leak pattern, now left unaddressed

💡 Suggestion — `AreClose` in the test mixes coordinate tolerance with width/radius tolerance

Devil's Advocate

Verdict: LGTM

Fix Candidates

Cross-Pollination

try-fix-1 — Build options without temporary handlers

try-fix-2 — MapHandler-owned option factories

Comparative Fix Report — PR #35634

Inputs

Candidate comparison

Winning candidate

Notes

Uh oh!

Labels

5 participants

Uh oh!

Conversation

AdamEssenmacher commented May 27, 2026

Summary

Root Cause

Validation

github-actions Bot commented May 27, 2026

dotnet-policy-service Bot commented May 27, 2026

kubaflo commented May 27, 2026

MauiBot commented May 27, 2026

🤖 AI Summary

Gate Result: ✅ PASSED

🔍 Regression Cross-Reference

Key Findings

Code Review Summary

Fix Candidates

Code Review — PR #35634

Independent Assessment

Reconciliation with PR Narrative

Findings

⚠️ Warning — Error messages are now semantically incorrect after refactor

💡 Suggestion — AddPins has the identical handler-leak pattern, now left unaddressed

💡 Suggestion — AreClose in the test mixes coordinate tolerance with width/radius tolerance

Devil's Advocate

Verdict: LGTM

Fix Candidates

Cross-Pollination

try-fix-1 — Build options without temporary handlers

try-fix-2 — MapHandler-owned option factories

Comparative Fix Report — PR #35634

Inputs

Candidate comparison

Winning candidate

Notes

Uh oh!

Labels

5 participants

💡 Suggestion — `AddPins` has the identical handler-leak pattern, now left unaddressed

💡 Suggestion — `AreClose` in the test mixes coordinate tolerance with width/radius tolerance