openharmony-sig/flutter_flutter/ - 提交记录

!2164 merge update_335 into oh-3.35.7-release

openharmony_ci — Thu, 24 Sep 2026 10:27:47 GMT

publish Flutter 3.35.7+ohos-1.0.5 ReleaseNote and CHANGELOG_OHOS

Created-by: wwyang09 Commit-by: wenwenyang Merged-by: openharmony_ci Description: ## Why are these changes being made? publish Flutter 3.35.7+ohos-1.0.5 ReleaseNote and CHANGELOG_OHOS

Changelog

Test Plan

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-release

See merge request: CPF-Flutter/flutter_flutter!2164

docs: publish Flutter 3.35.7+ohos-1.0.5 ReleaseNote and CHANGELOG_OHOS

wenwenyang — Thu, 24 Sep 2026 07:11:19 GMT

Signed-off-by: wenwenyang yangwenwen7@h-partners.com

AI[100%] Human Fixed[0%] Human[0%] AI Adopted[31%] Co-authored-by: opencode (glm-5.2) ai@local

!2130 merge oh-3.35.7-release into oh-3.35.7-release

openharmony_ci — Wed, 23 Sep 2026 11:40:58 GMT

docs: update version release note

Created-by: wwyang09 Commit-by: wenwenyang Merged-by: openharmony_ci Description:

Why are these changes being made?

docs: update version release note

Changelog

Test Plan

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-release

See merge request: CPF-Flutter/flutter_flutter!2130

docs: update version release note

wenwenyang — Wed, 23 Sep 2026 07:01:23 GMT

Signed-off-by: wenwenyang yangwenwen7@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!2118 merge version/3.35 into oh-3.35.7-release

openharmony_ci — Tue, 22 Sep 2026 02:45:21 GMT

chore: Branch oh-3.35.7-release update engine.ohos.har.version and engine.ohos.version to f3113bb0309462da9dfbb4d1b08efcb5e071220f

Created-by: xiedrsz Commit-by: 谢代荣 Merged-by: openharmony_ci Description: chore: Branch oh-3.35.7-release update engine.ohos.har.version and engine.ohos.version to f3113bb0309462da9dfbb4d1b08efcb5e071220f

See merge request: CPF-Flutter/flutter_flutter!2118

chore: Branch oh-3.35.7-release update engine.ohos.har.version and engine.ohos.version to f3113bb0309462da9dfbb4d1b08efcb5e071220f

谢代荣 — Mon, 21 Sep 2026 11:24:08 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!2088 merge oh-3.35.7-release into oh-3.35.7-release

openharmony_ci — Mon, 21 Sep 2026 10:00:50 GMT

Merge oh-3.35.7-dev into oh-3.35.7-release

Created-by: xiedrsz Commit-by: o60088243;zhong_ning;谢代荣;openharmony_ci;lx123546879;luqi_tan;liujiake;huhaodong;xiaolieask;cjand;ArcHK;hezhengyi;HHHxm2;huangyouhua;zzx89757;wenwenyang;Kemin123;zhanggong Merged-by: openharmony_ci Description: PR body — 3.35.7

dev 合入 commit 范围：origin/oh-3.35.7-release~50..origin/oh-3.35.7-dev（约 50+ commits）
冲突处理策略：-X theirs（dev 优先）
Release 专属保留：bin/internal/engine.ohos.har.version、bin/internal/engine.ohos.version、.ci_ohos.yaml 的 target_branch 与 Prepare openharmony SDK 任务
Reverted PR: !1762 (text_paralle_335_0811)
完整冲突日志：/tmp/opencode/merge-conflicts-2026-09-20/3.35.7.md

Recent commits included:

!2064 merge oh-3.35.7-dev into oh-3.35.7-dev
!2074 merge version/3.35 into oh-3.35.7-dev
!1958 merge dpi_refactor into oh-3.35.7-dev
!2011, !1987 merge oh-3.35.7-dev into oh-3.35.7-dev
!2042 merge plugin_restore_glm_3.35 into oh-3.35.7-dev
!2035 merge version/3.35 into oh-3.35.7-dev
!2019 merge cherry-pick_pre-build-test-assets_to_oh-3.35.7-dev into oh-3.35.7-dev
!2027 merge fix/ohos-template-api26-335 into oh-3.35.7-dev
!1998 merge fix/texture-release-335 into oh-3.35.7-dev
!2014 merge fix/arkts-ut-fixes-335 into oh-3.35.7-dev
!1984 merge fix/335-unregister-preview into oh-3.35.7-dev
!2020 merge fix/335-physical-touch-slop into oh-3.35.7-dev
!1923 merge fix/safe-area-padding-avoidance into oh-3.35.7-dev
!1969 merge fix-channel-error-envelope-oh-3.35.7-dev into oh-3.35.7-dev
!1760 merge oh-3.35.7-dev into oh-3.35.7-dev
!1963 merge zhong_ut_335 into oh-3.35.7-dev
!1924 merge oh-3.35.7-lzy into oh-3.35.7-dev
!1938 merge oh-3.35.7-dev-pick-07d47c5 into oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!2088

【3.35】修复StandardMessageCodec.writeValueInternal 绕过子类覆写导致序列化失败

我什么都做不到 — Mon, 21 Sep 2026 08:34:31 GMT

Signed-off-by: o60088243 ouhaitao2@h-partners.com

AI[100%] Human Fixed[0%] Human[0%] AI Adopted[68%] Co-authored-by: opencode (glm-5.2) ai@local

【3.35】change(Template): 更新oh flutter图标

zhong_ning — Mon, 21 Sep 2026 08:34:31 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com

fix: engine format check failures.

谢代荣 — Mon, 21 Sep 2026 06:21:45 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

Revert "!1762 merge text_paralle_335_0811 into oh-3.35.7-dev"

谢代荣 — Mon, 21 Sep 2026 05:07:10 GMT

This reverts commit 0b788db5b07ea91a2199a51833853d66aa8c8e41, reversing changes made to 21e5c0e43e1859ebc36f756904adb6a623612ecf.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

Merge oh-3.35.7-dev into oh-3.35.7-release

谢代荣 — Mon, 21 Sep 2026 04:06:13 GMT

Conflicts (resolved in favor of dev via -X theirs):

bin/internal/engine.ohos.{har.,}version: kept release versions
.ci_ohos.yaml: auto-merged correctly (target_branch=release, Prepare openharmony SDK retained)

No reverts in this merge.

Strategy: -X theirs.

Full log: /tmp/opencode/merge-conflicts-2026-09-20/3.35.7-norevert.md

Signed-off-by: 谢代荣 xiedairong@h-partners.com

!2095 merge version/3.35 into oh-3.35.7-dev

openharmony_ci — Sun, 20 Sep 2026 14:14:32 GMT

chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 97bba3feeda7bf3f7f287e2d8747f1d9fd803434

Created-by: xiedrsz Commit-by: 谢代荣 Merged-by: openharmony_ci Description: chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 97bba3feeda7bf3f7f287e2d8747f1d9fd803434

See merge request: CPF-Flutter/flutter_flutter!2095

chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 97bba3feeda7bf3f7f287e2d8747f1d9fd803434

谢代荣 — Sun, 20 Sep 2026 10:02:02 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!2080 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Sun, 20 Sep 2026 08:40:13 GMT

fix:Fix the total frame count issue during sliding frame drops

Created-by: lx123546879 Commit-by: lx123546879 Merged-by: openharmony_ci Description:

Why are these changes being made?

The code logic error in scroll_start_frame causes an error when calculating the total number of frames.

Changelog

fixed Fix the total frame count issue during sliding frame drops

Test Plan

Create, build, and run the demo for the scrolling frame loss.
Use DevEco Studio to capture traces.
Run the hdc shell command hisysevent -r -o PERFORMANCE -n OTHER_SCROLL_JANK to capture the reported information.
Check whether the values of the trace captured by DevEco Studio are consistent with the reported information.

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!2080

fix:Fix the total frame count issue during sliding frame drops

lx123546879 — Sun, 20 Sep 2026 03:23:20 GMT

Signed-off-by: lx123546879 liuxin562@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!1940 merge oh-3.35.7-release into oh-3.35.7-release

openharmony_ci — Fri, 18 Sep 2026 08:30:12 GMT

Merge tag 3.35.8-ohos-1.0.4 into oh-3.35.7-release

Created-by: xiedrsz Commit-by: 谢代荣;wenwenyang;openharmony_ci;zhong_ning;xiedrsz;huangyouhua;luqi_tan;Kemin123;hezhengyi;cjand;liujiake;huhaodong;zhanggong;小黑和平;wanpengsz;chunhtai;HHHxm2;wwyang09;xiaolieask;hhd Merged-by: openharmony_ci Description: ## 概述

将 tag 3.35.8-ohos-1.0.4 合入 oh-3.35.7-release 分支。本次按 skill merge-dev-to-release 完整流程执行。

合并 commit

276f4eeb599 Merge tag 3.35.8-ohos-1.0.4 into oh-3.35.7-release (v4 via skill)

skill 流程执行

阶段 1-3：Reapply 8 个 Revert commit（逆时间序）

识别 release HEAD (add49ea449c) 自 b12ccec6b86（上次合 dev）之后的连续 Revert chain：7 个连续 Revert（2026-07-01 21:33:09-12）+ 1 个孤立 Revert !1299，按用户决策全部 reapply：

顺序	Subject
1	Reapply "!1310 imageClearSend335"
2	Reapply "!1320 dmaDecode335"
3	Reapply "!1341 oh-3.35.7-dev"
4	Reapply "!1365 oh-3.35.7-dev"
5	Reapply "!1395 DmaDecodeRev335"
6	Reapply "!1281 oh-3.35.7-dev"
7	Reapply "!1408 password_335"（FlutterView.ets 冲突：采用 password_335 版本）
8	Reapply "!1299 oh-3.35.7-dev"

阶段 4：merge -X theirs tag --no-commit

reapply 后 release HEAD 与 tag 代码基本一致，merge 无冲突自动完成。

阶段 5：冲突处理

Skill 规则 2（保留 release 分支代码）

bin/internal/engine.ohos.{har,version}：git checkout HEAD -- restore release 版本

Skill 规则 3 + 用户原话"其他代码跟 tag 一致"

ci/ 和 .ci_ohos.yaml 全部采用 tag 版本（含 4 个 tag-only 新脚本：ohos_ci_runner.sh、clone_project.sh、engine_analyze.sh、prepare_tests.sh）
README.md 采用 tag 版本

阶段 6：验证与 tag 差异（7 个文件）

全部为 release 分支专属或 reapply 引入：

文件	类型	说明
`bin/internal/engine.ohos.har.version`	Skill 规则 2	release 版本号
`bin/internal/engine.ohos.version`	Skill 规则 2	release 版本号（-1B）
`docs/roadmap/Flutter-OH Roadmap.md`	release 信息	release 分支专属 roadmap
`release-notes/Flutter 3.35.7-ohos 1.0.1 ReleaseNote.md`	release 信息	release 分支专属 release note
`release-notes/Flutter_3.35.7-ohos_0.0.3_ReleaseNote.md`	release 信息	release 分支专属 release note
`release-notes/Flutter_3.35.7-ohos_1.0.3_ReleaseNote.md`	release 信息	release 分支专属 release note
`engine/.../FlutterView.ets`	reapply 引入	reapply !1408 引入的 password_335 功能

Silent conflict: 0 ✓

关键改进 vs 之前版本

之前 v3 出现的 20 个 silent conflict（ohos_image_generator.cpp 等 release Revert 撤销的代码未正确合并），通过本次 8 个 reapply 完美解决。reapply 让 release HEAD 重新引入这些代码，与 tag 一致，merge 时不再产生 silent conflict。

详细冲突日志：/tmp/opencode/merge-conflicts-2026-09-05/CONFLICTS.md

See merge request: CPF-Flutter/flutter_flutter!1940

!2063 merge oh-3.35.7-release into oh-3.35.7-release

openharmony_ci — Fri, 18 Sep 2026 06:31:57 GMT

[oh-3.35.7-release] 更新 PR 模板，适配 OHOS 仓库规范

Created-by: luqi_tan Commit-by: luqi_tan Merged-by: openharmony_ci Description: ## 关联 Issue

Close #2736

变更说明

将 .github/PULL_REQUEST_TEMPLATE.md 从 Flutter 上游旧版模板替换为适配 OHOS 仓库规范的模板。

主要变更

移除旧版 Flutter 上游 checklist（CLA 签署、Flutter Style Guide、Contributor Guide 等无关项）
新增 OHOS 仓库规范 checklist：
- 兼容性变更检查
- 性能问题检查
- 编码规范符合性
- 文档更新检查
- 测试用例要求
- 文件引入合规性
- 合入分支确认

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [ ] oh-3.44.9-dev
- [ ] oh-3.41.9-dev
- [x] oh-3.35.7-dev
- [ ] oh-3.32.4-dev
- [ ] oh-3.27.4-dev
- [ ] 3.22.0-ohos
- [ ] dev

See merge request: CPF-Flutter/flutter_flutter!2063

!2064 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Fri, 18 Sep 2026 06:22:09 GMT

[oh-3.35.7-dev] 更新 PR 模板，适配 OHOS 仓库规范

Created-by: luqi_tan Commit-by: luqi_tan Merged-by: openharmony_ci Description: ## 关联 Issue

Close #2737

变更说明

将 .github/PULL_REQUEST_TEMPLATE.md 从 Flutter 上游旧版模板替换为适配 OHOS 仓库规范的模板。

主要变更

移除旧版 Flutter 上游 checklist（CLA 签署、Flutter Style Guide、Contributor Guide 等无关项）
新增 OHOS 仓库规范 checklist：
- 兼容性变更检查
- 性能问题检查
- 编码规范符合性
- 文档更新检查
- 测试用例要求
- 文件引入合规性
- 合入分支确认

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [ ] oh-3.44.9-dev
- [ ] oh-3.41.9-dev
- [x] oh-3.35.7-dev
- [ ] oh-3.32.4-dev
- [ ] oh-3.27.4-dev
- [ ] 3.22.0-ohos
- [ ] dev

See merge request: CPF-Flutter/flutter_flutter!2064

chore: update pull request description template

luqi_tan — Fri, 18 Sep 2026 01:26:47 GMT

Signed-off-by: luqi_tan tanluqi@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!2074 merge version/3.35 into oh-3.35.7-dev

openharmony_ci — Fri, 18 Sep 2026 01:03:46 GMT

chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 947026b12d8b4254b9cdcb869edb8f8967708338

Created-by: xiedrsz Commit-by: 谢代荣 Merged-by: openharmony_ci Description: chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 947026b12d8b4254b9cdcb869edb8f8967708338

See merge request: CPF-Flutter/flutter_flutter!2074

chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 947026b12d8b4254b9cdcb869edb8f8967708338

谢代荣 — Thu, 17 Sep 2026 11:16:23 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!1958 merge dpi_refactor into oh-3.35.7-dev

openharmony_ci — Thu, 17 Sep 2026 08:49:27 GMT

[3.35] fix(flex_overflow_strategy): per-frame aggregation for multi-instance overflow sampling and route-change gate to prevent DPR oscillation

Created-by: liujiake Commit-by: liujiake Merged-by: openharmony_ci Description: ## Why are these changes being made?

The dynamic DPI feature had a DPR oscillation bug: when a RenderFlex overflow triggered DPR shrink, the resulting logical size increase could cause the app to switch widget types (e.g. via LayoutBuilder), disposing the old RenderFlex. The old code reset DPR immediately on dispose, which caused the app to switch back, re-overflow, and loop indefinitely.

The root cause is that the strategy cannot distinguish whether a dispose was caused by user navigation or by the DPR change itself — an undecidable problem on the dispose path.

Changelog

Per-frame aggregation: All handleOverflow calls during a frame only collect samples into _frameSamples without reporting. A single post-frame callback (_aggregateAndReport) processes all samples, issuing at most one _reportFlexOverflow per frame (taking the minimum scale across all overflowing instances). This eliminates multi-instance conflicts and the single-frame flash during route transition animations.
Route-change gate for reset: DPR reset now requires three conditions: _isReportingOverflow == true (currently scaling) AND _overflowingInstances.isEmpty (all tracked instances disposed) AND _routeChanged == true (a route transition occurred). DPR-shrink-induced widget rebuilds do not set _routeChanged, so they cannot trigger reset — breaking the oscillation loop.
dispose no longer triggers reset: dispose() only removes the instance from tracking sets and schedules a final aggregation pass. The reset decision is entirely in _aggregateAndReport, gated by _routeChanged.
Navigator route-change notification: Added OhosFlexOverflowStrategy.notifyRouteChanged() call in navigator.dart's _flushHistoryUpdates() to signal that a push/pop/replace/remove occurred. Guarded by defaultTargetPlatform == TargetPlatform.ohos.
rendering.dart export: Exported flex_overflow_strategy.dart from rendering.dart barrel file, so navigator.dart can access OhosFlexOverflowStrategy via the existing import 'package:flutter/rendering.dart' without a separate import.
Feature guard in notifyRouteChanged: Added if (!_kEnableFlexOverflow || !kReleaseMode) return; at the top of notifyRouteChanged(), matching the creation conditions in createDefaultOverflowStrategy.
Retained delay mechanisms: The 600ms suppression timer and 180ms confirmation timer are preserved to maintain the SearchAnchor fix from PR #1078. Device testing confirmed that removing the 600ms timer causes jitter when returning from the search input view, and removing both timers prevents the search input view from opening at all (the original PR #1078 issue).
Cancel stale timers on route change: "notifyRouteChanged()" now cancels the 600ms suppression timer and 180ms confirmation timer, and clears their expiry flags. Without this, a timer started on the previous page would continue running and fire on the new page, prematurely setting "_suppressionExpired" and bypassing the suppression phase. (Fix for AI-Review issue.)

Test Plan

Run dart analyze --fatal-infos on all modified files — passed with no issues.
Run dart format on all modified files — passed.
Device test on foldable screen: fold/unfold with an overflowing Column app — no oscillation, DPR stays scaled after shrink.
Device test: navigate away from an overflowing page (pop/pushReplacement) — DPR resets correctly.
Device test: route transition animation — no single-frame flash between reset and re-shrink.
Unit test: flutter test packages/flutter/test/rendering/flex_overflow_strategy_test.dart

Test Run Result Summary

dart analyze --fatal-infos on rendering.dart, navigator.dart, flex_overflow_strategy.dart: No issues found.
dart format: All files formatted, no changes needed.
Device verification: TBD (pending device test results).

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1958

chore: update pull request description template

luqi_tan — Thu, 17 Sep 2026 08:31:29 GMT

Signed-off-by: luqi_tan tanluqi@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!2011 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Thu, 17 Sep 2026 08:29:42 GMT

【3.35】修复channel传递递归数据导致jscrash

Created-by: weixin_46147069 Commit-by: o60088243 Merged-by: openharmony_ci Description:

Why are these changes being made?

StandardMessageCodec.writeValue causes stack overflow when serializing circular reference objects (e.g., network error objects with request.response = response). The crash reports "Stack overflow!" give no clue about the root cause.

Changelog

Fixed stack overflow crash when serializing circular reference objects in StandardMessageCodec. Circular references are now detected via visited: Set with stack-based add/delete, throwing Error("Circular reference detected (...)") instead of infinite recursion.

Test Plan

https://gitcode.com/weixin_46147069/stackoverdemo

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.44.9-dev
- [x] oh-3.41.9-dev
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!2011

!1987 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Thu, 17 Sep 2026 07:00:25 GMT

【3.35】Solve the problem of abnormal coordinate distribution for platformview click events under dynamic dpi

Created-by: xiaolie5 Commit-by: xiaolieask Merged-by: openharmony_ci Description: ## 问题描述

在 OHOS 平台上,当 Flutter DPR 与系统显示密度不一致时(由 updateDpiScale 或系统显示缩放变更引起),WebView 等平台视图内的指针事件坐标出现系统性偏移。偏移量与坐标值成正比:

点击偏移(物理px) ≈ 坐标 × (flutter_dpr / system_density − 1)

在 Mate 60 (系统密度 3.25) 上实测:DPR 3.181 时偏移 2.9~13.3 CSS px;DPR 3.135 时最大偏移约 80 物理px。

根因分析

OHOS ArkTS 嵌入层将平台视图节点按 Flutter 逻辑尺寸(以 vp 为单位)布局,节点布局像素 = 逻辑值 × 系统密度。合成器按 flutter_dpr / system_density 缩放绘制。触摸解码(TouchEventProcessor)用系统密度换算,因此触摸包必须携带节点布局像素而非原始屏幕像素。

C++ 引擎(OhosTouchProcessor)原先直接序列化 XComponent 的原始物理屏幕像素,当 flutter_dpr ≠ system_density 时两个坐标空间不匹配。

修复方案

修复 1:C++ 引擎侧坐标映射(核心修复)

文件:flutter/shell/platform/ohos/ohos_touch_processor.cpp、platform_view_ohos.cpp/.h

在触摸/鼠标/滚轮包发送前,将坐标字段乘以 system_density / flutter_dpr,从屏幕物理像素映射到平台视图布局像素:

// platform_view_ohos.cpp — 新增
double PlatformViewOHOS::GetScreenToPlatformViewLayoutScale() const {
  const double flutter_dpr = viewport_metrics_.device_pixel_ratio;
  const double system_density = PlatformViewOHOSNapi::display_density_pixels;
  if (!(flutter_dpr > 0.0) || !(system_density > 0.0)) {
    return 1.0;
  }
  return system_density / flutter_dpr;
}

ohos_touch_processor.cpp 中四个发送点均应用此缩放:

PlatformViewOnTouchEvent(触摸主路径)
HandleVirtualTouchEvent(API < 20 虚拟触摸)
HandleMouseEvent(鼠标)
PlatformViewOnAxisEvent(轴事件/滚轮)

当 flutter_dpr == system_density 时缩放为 1.0(恒等),零回归风险。

修复 2:ArkTS 嵌入层密度同步

文件:flutter/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets

引擎侧的 PlatformViewOHOSNapi::display_density_pixels(静态变量)原仅在引擎挂载时写入一次,系统显示缩放变更后变为过期值。在四个回调中同步调用 updateDensity():

回调	触发时机
`onDevicePixelRatioChange`	`updateDpiScale` 请求到达时
`densityUpdateCallback`	UIContext 密度变更(系统缩放变化)
`windowSizeChangeCallback`	窗口尺寸变化
`displayChangeCallback`	显示属性变化(含自定义 DPI 激活时)

修复 3:parseInt → parseFloat

文件:flutter/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/TouchEventProcessor.ets

decodeMousePacket 中鼠标坐标用 parseInt 截断小数部分(触摸用 parseFloat),统一改为 parseFloat。

修复 4:customDpiActive 守卫条件收紧

文件:flutter/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets

densityUpdateCallback 在系统密度变化(scale=1,非自定义)时也无条件设置 customDpiActive=true,导致后续所有 updateDpiScale 请求被 DisplayMetricsChannel 的守卫静默拦截。修复为仅在 scale !== 1 时设置:

if (currentUri && scale !== 1) {  // 仅真正的自定义密度才激活守卫
  this.flutterEngine?.getDisplayMetricsChannel()?.setCustomDpiActive(true);
}

修改文件清单

文件	修改类型	内容
`shell/platform/ohos/platform_view_ohos.h`	新增方法声明	`GetScreenToPlatformViewLayoutScale()`
`shell/platform/ohos/platform_view_ohos.cpp`	新增方法实现	密度换算逻辑
`shell/platform/ohos/ohos_touch_processor.cpp`	修改	四个发送点的坐标缩放
`shell/platform/ohos/ohos_touch_processor.h`	新增方法声明	`ScaleTouchEventCoordinates` 静态方法
`flutter_embedding/.../view/FlutterView.ets`	修改	密度同步 + customDpiActive 守卫
`flutter_embedding/.../TouchEventProcessor.ets`	修改	parseFloat 修复
`flutter_embedding/.../FlutterNapi.ets`	新增日志	`updateDensity called` 调试日志
`shell/platform/ohos/ohos_touch_processor_unittests.cpp`	新增测试	6 个单元/回归测试
`shell/platform/ohos/platform_view_ohos_unittests.cpp`	新增测试	3 个密度换算测试
`shell/platform/ohos/test_stubs/ace_napi_stub.cc/.h`	新增基础设施	字符串记录(用于端到端测试)

验证结果

Mate 60 (BRA-AL00, HarmonyOS 7.0.0.102),系统密度 3.25→2.7625→3.8 多次切换:

场景	修复前	修复后
DPR 3.181 点击红点	偏移 −4.1 CSS px	(51.8, 51.9) vs (52,52),误差 0.2 px
DPR 3.135 键盘弹出	偏移 −4.9 CSS px	(51.7, 51.9),误差 0.3 px
屏幕低处 (608,2000)	偏移 −13.3 CSS px	(191.1, 495.1) vs 预测 495.2,误差 0.1 px
点击反馈与手指重合	偏移 (+12, −42)	(−1, 0)
运行中改系统缩放 2.7625→3.8	偏移 80+ px	(51.8, 51.8) vs (52,52)
手动缩放 0.5x (DPR 1.9)	—	(51.6, 51.6) vs (52,52)
dotA/B/C 三点校准	—	误差均 <0.3 CSS px (<1 物理px)

单元测试

ohos_touch_processor_unittests.cpp(6 个新测试)

测试	验证内容
`ScaleTouchEventCoordinatesIdentityAtUnitScale`	scale=1.0 时全字段恒等
`ScaleTouchEventCoordinatesScalesCoordinatesOnly`	8 个坐标字段 ×(3.25/3.181) 精确缩放,非坐标字段保留
`HandleTouchEventScalesPacketWhenCustomDpiActive`	端到端:真实 ShellHolder + DPR 3.181 → 包坐标全部 ×1.0217
`HandleTouchEventKeepsPacketUnchangedWhenDprsMatch`	端到端恒等(防过度缩放)
`HandleMouseEventScalesPacketWhenCustomDpiActive`	鼠标包 4 坐标缩放
`HandleScrollEventScalesAxisPacketWhenCustomDpiActive`	轴事件包 6 坐标缩放

platform_view_ohos_unittests.cpp(3 个新测试)

测试	验证内容
`ScreenToLayoutScaleIdentityWhenDprsMatch`	密度相等时返回 1.0
`ScreenToLayoutScaleForCustomDpi`	3.25/3.181 比例值
`ScreenToLayoutScaleInvalidValuesFallBackToOne`	NaN/零值/负值回退 1.0

See merge request: CPF-Flutter/flutter_flutter!1987

!2042 merge plugin_restore_glm_3.35 into oh-3.35.7-dev

openharmony_ci — Thu, 17 Sep 2026 04:09:37 GMT

【3.35】fix(ohos): restore plugin state after ability recreation

Created-by: huhaodong Commit-by: huhaodong Merged-by: openharmony_ci Description: ## Why are these changes being made?

Plugin state saved via OnSaveStateListener during onSaveState was dropped when a UIAbility was recreated: only framework restoration data was restored, so plugins lost their state across ability recreation. This change forwards the saved plugin state through AbilityControlSurface to the registered OnSaveStateListener instances on restore, keeping the callback optional so existing plugin and control-surface implementations stay source compatible.

Changelog

AbilityControlSurface / OnSaveStateListener: add optional onRestoreInstanceState?(wantParam) callback, backward compatible with existing implementations.
FlutterEngineConnectionRegistry: forward onRestoreInstanceState to the current ability plugin binding.
FlutterEngineAbilityPluginBinding: iterate all registered OnSaveStateListeners and dispatch restore via optional call (listener?.onRestoreInstanceState?.(...)).
FlutterAbilityAndEntryDelegate.onRestoreInstanceState: tolerate want.parameters == undefined; call ensureAlive() before restoring; keep the framework RestorationChannel flow unchanged; distribute plugin state only when the host attaches the engine to the ability; validate the saved plugin state (missing or non-object value becomes an empty {}).
Add 5 ohosTest cases in FlutterAbilityAndEntryDelegateTest.test.ets: normal plugin-state distribution, missing plugins key → empty object, no distribution when the host does not attach the engine, legacy control surface without the restore callback, invalid plugin-state type → empty object.

Test Plan

Use the demo: https://gitcode.com/huhaodong/flutter_demo/tree/master/plugin_restore_demo, register a real OnSaveStateListener plugin, save a sentinel, recreate the UIAbility (background eviction / relaunch), and verify the restore callback receives the same sentinel.

devecocli build --modules flutter@default flutter_native@default — BUILD SUCCESSFUL.
hvigor genOnDeviceTestHap (module=flutter@ohosTest) — BUILD SUCCESSFUL (unsigned HAP; this project has no signing config, so no on-device ohosTest run).

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev
- [x] oh-3.44.9-dev
- [x] oh-3.41.9-dev，demo在 https://gitcode.com/huhaodong/flutter_demo/tree/master/plugin_restore_demo

Fixes #2718

See merge request: CPF-Flutter/flutter_flutter!2042

【3.35】修复channel传递递归数据导致jscrash

我什么都做不到 — Wed, 16 Sep 2026 10:38:47 GMT

Signed-off-by: o60088243 ouhaitao2@h-partners.com

AI[99%] Human Fixed[0%] Human[1%] AI Adopted[100%] Co-authored-by: opencode (glm-5.2) ai@local

feat(flex_overflow): dynamic DPI overflow strategy with testing API and unit tests

liujiake — Wed, 16 Sep 2026 09:33:56 GMT

Overall changes:

Centralised state: Move all overflow-tracking state from per-instance fields to static, eliminating DPR conflicts when multiple RenderFlex instances each maintained independent state.
Per-frame aggregation: Add _frameSamples (Map<RenderFlex, double>) collected in a single post-frame callback. Each frame issues at most one DPR report using the minimum scale across all overflowing instances. Samples persist across frames so timer-scheduled empty frames (no performLayout) still see the last known overflow state.
Route-change gated DPR reset: Navigator calls notifyRouteChanged() on push/pop/replace/remove. DPR reset requires _routeChanged==true AND all tracked overflowing instances disposed, preventing premature resets on push and immediate resets on pop that caused DPR oscillation.
Precise dispose cleanup: dispose(RenderFlex) receives the disposed instance and removes it from _frameSamples and _overflowingInstances. DPR reset triggers only when every tracked instance has been disposed.
Simplified timer callbacks: Timers only set flags (_suppressionExpired / _confirmationExpired) and schedule aggregation, no longer accessing RenderFlex state or calling markNeedsLayout.
Export flex_overflow_strategy.dart for Navigator to reference.

Additional changes:

Add debugState/resetState testing API for OhosFlexOverflowStrategy
Optimize dynamic DPI enablement condition logic
Add flex_overflow_strategy_test with 19 test cases
Fix DPR reset on route change when surviving instances remain

Signed-off-by: liujiake liujiake1@h-partners.com

AI[42%] Human Fixed[0%] Human[58%] AI Adopted[99%]

chore: Replace OpenHarmony SDK.

谢代荣 — Wed, 16 Sep 2026 08:38:47 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!1994 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Wed, 16 Sep 2026 07:34:14 GMT

test:Add ArkTS code gatekeeping detection script

Created-by: lx123546879 Commit-by: lx123546879 Merged-by: openharmony_ci Description: ## Why are these changes being made?

Add ArkTS code gatekeeping detection script

Changelog

Add ArkTS code gatekeeping detection script

Test Plan

Run the ArkTS code gate test. python arkts_linter_cli.py --target-path ./src --output report.json

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1994

fix(ohos): restore plugin state after ability recreation

huhaodong — Tue, 15 Sep 2026 15:06:12 GMT

Restore plugin state saved by OnSaveStateListener after UIAbility recreation.

Add an optional restore callback through AbilityControlSurface and FlutterEngineConnectionRegistry, and handle missing or invalid Want state without breaking existing implementations.

Signed-off-by: huhaodong huhaodong6@huawei.com

AI[100%] Human Fixed[0%] Human[0%] AI Adopted[100%] Co-authored-by: opencode (glm-5.3) ai@local

Solve the problem of abnormal coordinate distribution for platformview click events under dynamic dpi

xiaolieask — Tue, 15 Sep 2026 12:31:06 GMT

Signed-off-by: xiaolieask xiaolie2@h-partners.com

AI[27%] Human Fixed[0%] Human[73%] AI Adopted[5%]

test:Add ArkTS code gatekeeping detection script

lx123546879 — Tue, 15 Sep 2026 08:28:14 GMT

Signed-off-by: lx123546879 liuxin562@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

chore: restore "Prepare openharmony SDK".

谢代荣 — Tue, 15 Sep 2026 07:02:25 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!2035 merge version/3.35 into oh-3.35.7-dev

openharmony_ci — Tue, 15 Sep 2026 06:52:07 GMT

chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 755d574bd166bf3c064fdc11a428959c50b97a81

Created-by: xiedrsz Commit-by: 谢代荣 Merged-by: openharmony_ci Description: chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 755d574bd166bf3c064fdc11a428959c50b97a81

See merge request: CPF-Flutter/flutter_flutter!2035

!1941 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Tue, 15 Sep 2026 03:53:14 GMT

fix(input): 修复多引擎场景FlutterView#onWindowCreated未调用导致界面不弹起的问题 [3.35]

Created-by: hezySign Commit-by: hezhengyi Merged-by: openharmony_ci Description:

Why are these changes being made?

修复多引擎场景FlutterView#onWindowCreated未调用导致界面不弹起的问题

Changelog

fixed: 修复多引擎场景FlutterView#onWindowCreated未调用导致界面不弹起的问题

Test Plan

多引擎场景下不调用 FlutterView#onWindowCreated
dart界面中增加输入框

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.44.9-dev
- [x] oh-3.41.9-dev
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1941

chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 755d574bd166bf3c064fdc11a428959c50b97a81

谢代荣 — Tue, 15 Sep 2026 01:24:25 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!2019 merge cherry-pick_pre-build-test-assets_to_oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Mon, 14 Sep 2026 12:49:03 GMT

fix: pre-build unit test assets and retry on write conflicts in CI

Created-by: xiedrsz Commit-by: 谢代荣 Merged-by: openharmony_ci Description: ## Why are these changes being made?

When 8 parallel CI shards run flutter test in packages/flutter simultaneously, each process independently builds build/unit_test_assets (including shader compilation stretch_effect.frag.spirv). Concurrent writes to the same file path cause race condition failures (exit 1), caught by --fatal-warnings, resulting in CI pipeline failures.

Changelog

Pre-build unit test assets (init_flutter_test_env.sh): Added Step 2.5/3 to run a single flutter test before parallel shards start, pre-building build/unit_test_assets so all shards reuse the same artifacts, eliminating the write conflict root cause.
Extend retry logic (run_shard_test.sh): Added retry on asset write conflicts (exit code 1 with "Could not write file to" in log), cleaning up build/unit_test_assets and retrying after 15s sleep, as a fallback for occasional race conditions.

Test Plan

Verify init_flutter_test_env.sh runs Step 2.5/3 and produces packages/flutter/build/unit_test_assets/ before shards start.
Verify parallel shards reuse pre-built assets without write conflicts.
Simulate asset write conflict and verify run_shard_test.sh retries correctly.

Test Run Result Summary

TBD (CI pipeline verification required)

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!2019

!2027 merge fix/ohos-template-api26-335 into oh-3.35.7-dev

openharmony_ci — Mon, 14 Sep 2026 12:38:39 GMT

【3.35】change(Template): OHOS模板targetSdkVersion升级至26.0.0

Created-by: zhong_ning Commit-by: zhong_ning Merged-by: openharmony_ci Description:

Why are these changes being made?

鸿蒙 7.0（API 26）已正式发布，最新 DevEco Studio（26.0.0）配套 SDK 已切换到 26.0.0。本仓 OHOS 平台初始化模板与 flutter_embedding 构建配置仍停留在旧 SDK 版本（模板 compatibleSdkVersion 为 5.1.0(18) 且未声明 targetSdkVersion；embedding 为 5.0.0(12)），导致新建工程仍基于旧 SDK，用最新 DevEco 打开时存在版本不一致、需手动改配的问题。

与 CPF-RN/ohos_react_native 已完成的适配（PR 3429）做法一致：targetSdkVersion 升级至 26.0.0，compatibleSdkVersion 保持低版本兼容值。

Changelog

app 模板与 add-to-app 模块模板（host_app_common）新增 targetSdkVersion: 26.0.0。
两处模板的 compatibleSdkVersion 统一为 5.0.5(17)。

Test Plan

2个改动文件的 JSON5 语法已校验通过（纯值替换，无结构性变更）。
DevEco Studio 26.0.0（API 26 SDK）下的 flutter create + 编译安装全链路验证

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

Issue: #2692

See merge request: CPF-Flutter/flutter_flutter!2027

!1998 merge fix/texture-release-335 into oh-3.35.7-dev

openharmony_ci — Mon, 14 Sep 2026 12:30:44 GMT

【3.35】fix(Texture): 实现 SurfaceTextureEntry.release() 修复按契约调用插件的 dispose 异常

Created-by: zhong_ning Commit-by: zhong_ning Merged-by: openharmony_ci Description: ## Why are these changes being made? SurfaceTextureEntry.release()(FlutterRenderer.ets 的 SurfaceTextureRegistryEntry)自 3.7 起一直是未实现的桩(直接 throw "Method not implemented"),但该接口经 index.ets 对外导出。按 Android 上游契约调用的三方插件(如 media_kit 的 VideoOutput.dispose)每次销毁必然触发运行时异常,且插件侧无兜底注销路径 → 纹理永不注销,每次播放器销毁都泄漏 native 资源。现有生态插件(video_player_ohos 等)恰好都直接调用 TextureRegistry.unregisterTexture(id),因此该问题长期未被暴露。

应用侧两种销毁方式的流程对比:

方式 A:textureRegistry.unregisterTexture(id) —— video_player_ohos 等现有插件的惯用写法,从未踩雷:

Dart player.dispose()
 └─ VideoPlayerApiImpl.ets:210
     └─ textureRegistry.unregisterTexture(playerId)        <- 直接调注册表注销
         └─ FlutterRenderer.unregisterTexture(id)
             └─ FlutterNapi.unregisterTexture(id)
                 └─ C++ UnRegisterExternalTexture -> 纹理移出注册表 + raster 线程同步   [全链路一直正常]

方式 B:surfaceTextureEntry.release() —— media_kit 按 Android 契约的写法,即本 PR 修复点:

Dart player.dispose()
 └─ ArkTS VideoOutput.dispose()
     ├─ textureUpdateCallback.onTextureUpdate(id, 0, ...)  (通知插件侧停止向该纹理送帧)
     ├─ surfaceTextureEntry.release()                     <- 调 entry 的 release()
     │    ├─ 修复前(3.7~3.47): throw 'Method not implemented.'
     │    │     └─ 插件 catch -> hilog "dispose error"
     │    │          └─ 纹理永不注销 -> native 资源泄漏(每次进出播放页泄漏一个纹理)
     │    └─ 修复后(本 PR): 防重入 -> flutterNapi.unregisterTexture(id)
     │          └─ 与方式 A 汇合,走同一条 native 注销链 [OK]
     └─ surfaceTextureEntry = null

两个接口从 3.7 起就并存:unregisterTexture 一直有实现,release() 一直是桩;修复后两种方式收敛为同一条 native 注销链,与 Android 语义对齐(Android SurfaceTextureRegistryEntry.release() = 防重入 + unregisterTexture(id) + 释放引擎自持资源;OHOS 引擎 ArkTS 层不持有资源,故无第三步)。

Changelog

实现 SurfaceTextureRegistryEntry.release():防重入(复用类中预埋的 released 字段)+ 转发 flutterNapi.unregisterTexture(textureId),与 Android SurfaceTextureRegistryEntry.release() 语义对齐(OHOS 引擎在 ArkTS 层不持有资源,故无 Android 侧 textureWrapper.release() 的对应步骤)
构造函数新增可选参数注入 FlutterNapi(向后兼容:外部 new SurfaceTextureRegistryEntry(id) 旧调用不受影响;未注入 napi 的 entry 未注册到引擎,release 为 no-op)

Test Plan

har 编译:ninja flutter/shell/platform/ohos:ohos_har → hvigor BUILD SUCCESSFUL,产物 flutter.har 内已确认包含新实现
真机验证(PLR-AL00,media_kit demo,3 轮创建+销毁):修复前每轮 dispose 均报 "dispose error: Error: Method not implemented.";替换 SDK 三个 har(flutter_embedding_debug / arm64_v8a_debug / flutter.har)并 flutter clean 重建后:0 error,每轮输出 "Surface disposed successfully"
ArkTS 单元测试:FlutterRendererTest.test.ets 新增 5 用例,覆盖 release 正常转发注销一次/二次调用防重入/未注入 napi 时 no-op/真实 FlutterNapi 无 shell holder 安全/getter 释放后可用
已核对 3.22~3.44 各版本 Android 基线 release() 实现完全一致,本改动与其语义对齐

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

Issue: #2667

See merge request: CPF-Flutter/flutter_flutter!1998

!2014 merge fix/arkts-ut-fixes-335 into oh-3.35.7-dev

openharmony_ci — Mon, 14 Sep 2026 12:19:32 GMT

【3.35】test(embedding): fix arkts ut naming conflicts and release preloaded engines

Created-by: zhong_ning Commit-by: zhong_ning Merged-by: openharmony_ci Description:

Why are these changes being made?

flutter_embedding 的 ArkTS UT 存在 hypium 命名冲突(同 describe 重复 it、顶层同名 describe、describe 名含空格/括号触发 00501007 非法字符)导致测试框架注册失败;FlutterEnginePreload 用例创建引擎不释放,单进程累积触发 DartVM OOM(object.cc:2905),全量 2600+ 用例无法一次跑通。

Changelog

removed a duplicated it case in DartMessengerTest.test.ets
renamed the second FlutterView.detachFromFlutterEngine describe to ...unattachedView
renamed 5 OhosAutoFillHelper describes to dot-separated legal names
added engine release (detachFromNativeAndReleaseResourcesAsync) in 3 FlutterEnginePreload cases
added ci/scripts/build_hello_world_for_arkts_test.bat (Windows port, debug mode to match the ohosTest debug HAP)

Test Plan

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

Issue: #2680

See merge request: CPF-Flutter/flutter_flutter!2014

!1984 merge fix/335-unregister-preview into oh-3.35.7-dev

openharmony_ci — Mon, 14 Sep 2026 09:40:59 GMT

【335】fix: unregister preview callbacks

Created-by: AndCJ Commit-by: cjand Merged-by: openharmony_ci Description:

Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.

List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

Pre-launch Checklist

[ ] I read the Contributor Guide and followed the process outlined there for submitting PRs.
[ ] I read the Tree Hygiene wiki page, which explains my responsibilities.
[ ] I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
[ ] I signed the CLA.
[ ] I listed at least one issue that this PR fixes in the description above.
[ ] I updated/added relevant documentation (doc comments with ///).
[ ] I added new tests to check the change I am making, or this PR is test-exempt.
[ ] I followed the breaking change policy and added Data Driven Fixes where supported.
[ ] All existing and new tests are passing.

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

See merge request: CPF-Flutter/flutter_flutter!1984

【3.35】change(Template): OHOS模板targetSdkVersion升级至26.0.0并统一compatibleSdkVersion至5.0.5(17)

zhong_ning — Mon, 14 Sep 2026 09:40:35 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com

!2020 merge fix/335-physical-touch-slop into oh-3.35.7-dev

openharmony_ci — Mon, 14 Sep 2026 07:35:32 GMT

【335】fix: physicalTouchSlop missing dpr conversion, touchSlop dropped to 1.4

Created-by: AndCJ Commit-by: cjand Merged-by: openharmony_ci Description:

Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.

List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

Pre-launch Checklist

[ ] I read the Contributor Guide and followed the process outlined there for submitting PRs.
[ ] I read the Tree Hygiene wiki page, which explains my responsibilities.
[ ] I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
[ ] I signed the CLA.
[ ] I listed at least one issue that this PR fixes in the description above.
[ ] I updated/added relevant documentation (doc comments with ///).
[ ] I added new tests to check the change I am making, or this PR is test-exempt.
[ ] I followed the breaking change policy and added Data Driven Fixes where supported.
[ ] All existing and new tests are passing.

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

See merge request: CPF-Flutter/flutter_flutter!2020

fix: pre-build unit test assets and retry on write conflicts in CI

谢代荣 — Mon, 14 Sep 2026 06:20:36 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[100%] Human Fixed[0%] Human[0%] AI Adopted[100%] Co-authored-by: opencode (glm-5.2) ai@local

fix: physicalTouchSlop missing dpr conversion, touchSlop dropped to 1.4

cjand — Mon, 14 Sep 2026 04:05:35 GMT

Signed-off-by: cjand liaochengjin@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

【3.35】test(embedding): fix arkts ut naming conflicts and release preloaded engines

zhong_ning — Sat, 12 Sep 2026 09:15:12 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com

【3.35】fix(Texture): implement SurfaceTextureEntry.release() via unregisterTexture

zhong_ning — Fri, 11 Sep 2026 11:03:01 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com

!1923 merge fix/safe-area-padding-avoidance into oh-3.35.7-dev

openharmony_ci — Fri, 11 Sep 2026 09:38:35 GMT

[3.35] fix(safearea): correct safe area padding for edgeToEdge and freeform window exit

Created-by: liujiake Commit-by: liujiake Merged-by: openharmony_ci Description: ## Why are these changes being made?

On HarmonyOS (API 18), Flutter apps in freeform multi-window mode have safe area padding avoidance failures. After exiting freeform multi-window or switching to edgeToEdge mode, paddingTop is incorrectly set to 0, causing content to overlap with the status bar.

The root cause is that setPaddingTop(0) was used in several places where setPaddingTop(undefined) should have been used. When paddingTop is 0 (not undefined), onAreaChange uses 0 directly instead of falling back to systemAvoidArea.topRect.height (status bar height), resulting in no avoidance.

Changelog

PlatformChannel.ets: Add result.success(null) in setEnabledSystemUIMode handler to ensure Flutter-side MethodChannel call completes properly.
PlatformPlugin.ets: Change setPaddingTop(0) to setPaddingTop(undefined) in updateSystemUiOverlays when window decor is visible, so onAreaChange falls back to systemAvoidArea.
PlatformPlugin.ets: Add explicit setPaddingTop calls at the end of setSystemChromeEnabledSystemUIMode — 0 for immersive/leanBack modes (status bar hidden), undefined for edgeToEdge (status bar visible, needs avoidance).
FlutterManager.ets: Change two setPaddingTop(0) to setPaddingTop(undefined) in handleWindowDecorSafeArea.

Test Plan

Build the engine with the fix and run a Flutter demo app on a HarmonyOS (API 18) device.
Enter freeform multi-window mode, then exit — verify top safe area avoidance is applied.
Call SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge) — verify content avoids the status bar.
Switch between immersive modes and edgeToEdge — verify paddingTop updates correctly each time.
Verify on both a demo app and a production app.

Test Run Result Summary

Verified on HarmonyOS (API 18) device with both a demo app and a production app. All scenarios (edgeToEdge mode, immersive mode switching, freeform multi-window exit) show correct safe area avoidance.

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1923

!1969 merge fix-channel-error-envelope-oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Fri, 11 Sep 2026 03:46:10 GMT

[3.35] fix(Channel): deliver error envelope when dart handler throws

Created-by: zhong_ning Commit-by: zhong_ning Merged-by: openharmony_ci Description:

Why are these changes being made?

FlutterException 实现 Error 接口,只有 message 属性、没有 getMessage() 方法。原生侧收到 Dart 错误信封后,catch 块调用 e.getMessage() 会再抛 TypeError,被外层 catch 吞掉,MethodResult.error() 永远不触发,调用方 Future 挂起(上层表现为 TimeoutException)。修复共覆盖 embedding 中 5 处同类误用。

Changelog

fixed MethodChannel/BackgroundMethodChannel 结果处理器:识别 FlutterException 后用其 code/message/details 回调 error(),未知异常仍走日志(对齐 Android 端行为)
fixed BackgroundMethodChannel sendable handler 与 EventChannel onListen/onCancel 抛错回传:用 instanceof Error 安全取 message

Test Plan

本地 demo 全分支验证（demo：https://gitcode.com/zhong_ning/flutter_demo/tree/main/channel_error_envelope_test ，用例覆盖本次修复的全部 catch 分支）5 个用例全部符合修复后预期：
- mc-reply / bg-reply（reply catch）：Dart 侧抛错回传错误信封，原生 ERROR callback fired code=E1448(-bg) 触发
- event-onlisten / event-oncancel（EventChannel onListen/onCancel catch）：兜底错误信封送达，Dart 侧收到 PlatformException
- bg-onmessage（BackgroundMethodChannel onMessage catch）：兜底错误信封送达，Dart await 收到 PlatformException（修复前为 MissingPluginException）
- 全程无 Failed to handle method call result / Oops! Failed to ... 日志
3.35 真机验证结论(OpenHarmony 6.0.2.130 / API 22):修复前 error callback 不触发,hilog 报 undefined is not callable @ MethodChannel.ets:164:41;修复后 ERROR callback fired code=E1445 msg=dart threw on purpose...;对照组正常返回信封不受影响

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

Issue: #2629

See merge request: CPF-Flutter/flutter_flutter!1969

!1997 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Fri, 11 Sep 2026 01:07:39 GMT

【3.35】postInputEventWithStrategy支持失败回落postInputEvent

Created-by: zhong_ning Commit-by: zhong_ning Merged-by: openharmony_ci Description: ## Why are these changes being made?

On API 24+ devices, PlatformView touch dispatch in EmbeddingNodeController prefers postInputEventWithStrategy over postTouchEvent / postInputEvent. On API 24 real devices, postInputEventWithStrategy can return false for native ArkUI components (e.g. Button) inside a PlatformView. When that happens and there is no fallback, those views receive no further dispatch and become completely unresponsive.

Changelog

fixed PlatformView input dispatch in EmbeddingNodeController: when postInputEventWithStrategy fails, fall back to postTouchEvent

Test Plan

API 24 or above real device (OpenHarmony 6.1.1.120): with the reproduction demo, the native ArkUI Button inside a PlatformView receives onClick again (counter increments via MethodChannel); WebView-type PlatformView keeps working.

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1997

!1990 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Thu, 10 Sep 2026 09:50:11 GMT

chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 14bddd4573ac1b6ed9043888880c42baf10746d7

Created-by: xiedrsz Commit-by: 谢代荣 Merged-by: openharmony_ci Description: chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 14bddd4573ac1b6ed9043888880c42baf10746d7

See merge request: CPF-Flutter/flutter_flutter!1990

fix(Channel): send fallback error envelope when result decode fails

zhong_ning — Thu, 10 Sep 2026 07:05:45 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com

chore: Branch oh-3.35.7-dev update engine.ohos.har.version to 14bddd4573ac1b6ed9043888880c42baf10746d7

谢代荣 — Thu, 10 Sep 2026 05:10:03 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

fix: engine format check failures for PR #1940

谢代荣 — Thu, 10 Sep 2026 02:50:47 GMT

Fix 3 format check failures reported by CI Engine Format Check:

Python: reformat ohos.py (line wrapping)
Whitespace: remove trailing spaces in image_descriptor.h, ohos_image_generator.h
C++/clang-format: reformat 22 files (ohos platform + impeller + lib/ui)

Verified locally with ci/bin/format.dart --check python,whitespace,clang: all checks pass with 0 formatting problems.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

fix(Channel): deliver error envelope when dart handler throws

zhong_ning — Wed, 09 Sep 2026 09:11:29 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com

!1959 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Wed, 09 Sep 2026 05:27:06 GMT

fix: 取消flutterView断言，避免crash

Created-by: ArcHK Commit-by: ArcHK Merged-by: openharmony_ci Description:

Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.

List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

Description Fix a crash in FlutterPage.ets:314 caused by a non-null assertion (!!) on flutterView when an unregistered viewId is passed. Root cause: When CrashPage navigates to FlutterPage with a viewId that has not been registered via createFlutterView(), FlutterManager.getFlutterView() returns null. The ?. optional chaining on lines 297–312 silently propagates the null, but line 314 uses !! which throws and crashes the app. Fix:

Add a null check with error logging after getFlutterView() so the failure is visible in logs: this.flutterView = FlutterManager.getInstance().getFlutterView(this.viewId); if (!this.flutterView) { Log.e(TAG, 'getFlutterView failed. viewId is ' + this.viewId.toString()); }
Change !! to ? on line 314 so null is handled safely instead of crashing: // Before this.rootDvModel = this.flutterView!!.getDVModel()?.children; // After this.rootDvModel = this.flutterView?.getDVModel()?.children; Before: App crashes with cannot read property getDVModel of null when navigating with an unregistered viewId. After: App logs the error and continues without crashing; rootDvModel is assigned undefined.

Pre-launch Checklist

[ ] I read the Contributor Guide and followed the process outlined there for submitting PRs.
[ ] I read the Tree Hygiene wiki page, which explains my responsibilities.
[ ] I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
[ ] I signed the CLA.
[ ] I listed at least one issue that this PR fixes in the description above.
[ ] I updated/added relevant documentation (doc comments with ///).
[ ] I added new tests to check the change I am making, or this PR is test-exempt.
[ ] I followed the breaking change policy and added Data Driven Fixes where supported.
[ ] All existing and new tests are passing.

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

See merge request: CPF-Flutter/flutter_flutter!1959

!1760 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Wed, 09 Sep 2026 03:08:25 GMT

add:白屏渲染相关dfx日志

Created-by: lx123546879 Commit-by: lx123546879 Merged-by: openharmony_ci Description:

Why are these changes being made?

add: DFX logs related to white screen rendering

Changelog

added DFX logs related to white screen rendering

Test Plan

Create a Flutter demo and check whether the logs contain new info, warning, or error logs.

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1760

fix: unregister preview callbacks

cjand — Wed, 09 Sep 2026 01:38:24 GMT

Signed-off-by: cjand liaochengjin@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!1963 merge zhong_ut_335 into oh-3.35.7-dev

openharmony_ci — Tue, 08 Sep 2026 11:41:07 GMT

【3.35】test(Ohos): add unit tests to improve coverage

Created-by: zhong_ning Commit-by: zhong_ning Merged-by: openharmony_ci Description: ## Why are these changes being made?

OHOS 平台引擎单元测试分支覆盖率不足，本次变更为 OHOS 平台层补充单元测试，提升分支覆盖率。

Changelog

新增 OHOS 平台层单元测试，覆盖 platform view、GL/Vulkan/software surface、semantics、触摸处理、外部纹理、vsync/QoS、message loop、XComponent、asset provider、image generator 等模块
新增四个测试文件：ohos_external_texture_gl_unittests.cpp、ohos_external_texture_vulkan_unittests.cpp、ohos_surface_gl_impeller_unittests.cpp、ohos_surface_vulkan_impeller_unittests.cpp
扩充 test_stubs 桩与 --wrap 链接桩，覆盖失败注入路径
更新 unittest_ohos 测试应用（实时输出、mock 条目）

Test Plan

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

Issue: #2621

See merge request: CPF-Flutter/flutter_flutter!1963

postInputEventWithStrategy支持失败回落postInputEvent

zhong_ning — Tue, 08 Sep 2026 09:13:32 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com Co-authored-by: Cursor cursoragent@cursor.com

fix(safearea): correct safe area padding for edgeToEdge and freeform window exit

liujiake — Tue, 08 Sep 2026 06:47:50 GMT

Change setPaddingTop(0) to setPaddingTop(undefined) in updateSystemUiOverlays and handleWindowDecorSafeArea so onAreaChange falls back to systemAvoidArea. Add explicit paddingTop by mode in setSystemChromeEnabledSystemUIMode. Add result.success(null) in setEnabledSystemUIMode.

Signed-off-by: liujiake liujiake1@h-partners.com

AI[100%] Human Fixed[0%] Human[0%] AI Adopted[100%]

Signed-off-by: liujiake liujiake1@h-partners.com Signed-off-by: liujiake liujiake1@h-partners.com Signed-off-by: liujiake liujiake1@h-partners.com Co-authored-by: github-copilot (glm-5.2) ai@local

update: 更新文件 FlutterPage.ets

HuangKai — Tue, 08 Sep 2026 03:46:54 GMT

字符串""改为''

Signed-off-by: ArcHK huangkai146@h-partners.com

add:白屏渲染相关dfx日志

lx123546879 — Tue, 08 Sep 2026 01:29:09 GMT

Signed-off-by: lx123546879 liuxin562@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

fix: 取消flutterView断言，避免crash

HuangKai — Mon, 07 Sep 2026 10:20:11 GMT

Signed-off-by: ArcHK huangkai146@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

【3.35】test(Ohos): add unit tests to improve coverage

zhong_ning — Mon, 07 Sep 2026 07:53:13 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com

!1924 merge oh-3.35.7-lzy into oh-3.35.7-dev

openharmony_ci — Mon, 07 Sep 2026 04:20:20 GMT

[3.35] test(Embedding): add ArkTS unit tests

Created-by: zhong_ning Commit-by: zhong_ning Merged-by: openharmony_ci Description:

Why are these changes being made?

为提升 oh-3.35.7 分支的 ArkTS 单测覆盖率,在 PR !1863 的测试 harness 基础上补充触摸事件、键盘事件、文本处理、视图生命周期、引擎连接注册表等模块的 hypium 用例。

Changelog

为 ohos embedding 补充了 19 个测试文件的 ArkTS 单元测试用例,覆盖 KeyEventHandler、KeyEmbedderResponder、PlatformViewsController 触摸跟踪、TouchEventProcessor、TextInputPlugin、TextUtils、FlutterView、FlutterEngineCache 等模块

Test Plan

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1924

fix(input): 修复多引擎场景FlutterView#onWindowCreated未调用,导致输入法弹起时keyboardHeightChangeCallback不执行的问题

hezhengyi — Mon, 07 Sep 2026 03:54:12 GMT

Signed-off-by: hezhengyi hezhengyi4@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!1938 merge oh-3.35.7-dev-pick-07d47c5 into oh-3.35.7-dev

openharmony_ci — Sat, 05 Sep 2026 03:14:04 GMT

add: add ui integration_tests

Created-by: HHHxm2 Commit-by: HHHxm2 Merged-by: openharmony_ci Description: ## Why are these changes being made?

Pick commit 07d47c56a31f5ad6efbbe0a9820c2835fdc6f3fe from oh-3.35.7-release to oh-3.35.7-dev to bring the new UI integration tests into the dev branch.

The original commit added 4 widget-behavior UI integration test files under dev/integration_tests/ui/integration_test/, expanding coverage for Flutter UI integration tests.

Changelog

Add dev/integration_tests/ui/integration_test/widget_behavior_test.dart (336 lines)
Add dev/integration_tests/ui/integration_test/widget_behavior_test2.dart (350 lines)
Add dev/integration_tests/ui/integration_test/widget_behavior_test3.dart (259 lines)
Add dev/integration_tests/ui/integration_test/widget_behavior_test4.dart (104 lines)

Total: +1049 lines, 0 files modified (pure addition).

Test Plan

These are integration tests; run on the corresponding target device:

flutter test integration_test -d <device_id> dev/integration_tests/ui/integration_test/

Test Run Result Summary

TBD

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1938

Merge tag 3.35.8-ohos-1.0.4 into oh-3.35.7-release (v4 via skill)

谢代荣 — Sat, 05 Sep 2026 02:08:10 GMT

按 skill merge-dev-to-release 流程执行：

阶段 1-3: Reapply 8 个 Revert commit（按用户决策全部 reapply）:

7 个连续 Revert chain + 1 个孤立 !1299

顺序：!1310, !1320, !1341, !1365, !1395, !1281, !1408(冲突), !1299

阶段 4: merge -X theirs tag --no-commit（无冲突自动完成）

阶段 5:

engine.ohos.{har,version} 保留 release 版本（skill 规则 2）
ci/ 和 .ci_ohos.yaml 全部采用 tag（含 tag-only 新脚本）
README.md 采用 tag 版本
FlutterView.ets 保留 reapply !1408 引入的 password_335 功能

最终与 tag 差异 7 个文件，全部 release 信息/专属：

engine.ohos.{har,version}（skill 规则 2）

roadmap + 3 个 release-notes（release 信息）

FlutterView.ets（reapply !1408）

Silent conflict: 0 ✓

Full log: /tmp/opencode/merge-conflicts-2026-09-05/CONFLICTS.md

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[0%] AI Adopted[0%]

Reapply "!1299 merge oh-3.35.7-dev into oh-3.35.7-dev"

谢代荣 — Sat, 05 Sep 2026 01:39:59 GMT

This reverts commit 884c4df82e43804a6278b580ed508f1aaeadb2ce.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

Reapply "!1408 merge password_335 into oh-3.35.7-dev"

谢代荣 — Sat, 05 Sep 2026 01:39:59 GMT

This reverts commit 77784b9dd53b9da2187618c8f0f44fffecc79a3d.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

Reapply "!1281 merge oh-3.35.7-dev into oh-3.35.7-dev"

谢代荣 — Sat, 05 Sep 2026 01:39:17 GMT

This reverts commit 5c6ac7d59730841f6dfe167cd0d11c6850f6329a.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

Reapply "!1395 merge DmaDecodeRev335 into oh-3.35.7-dev"

谢代荣 — Sat, 05 Sep 2026 01:39:17 GMT

This reverts commit 9a2ac90eea05cb71958311fb80b2d29848c08baa.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

Reapply "!1365 merge oh-3.35.7-dev into oh-3.35.7-dev"

谢代荣 — Sat, 05 Sep 2026 01:39:17 GMT

This reverts commit 2712e995fa0e02bd90b9851d3ba1ef2d6cde1bc6.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

Reapply "!1341 merge oh-3.35.7-dev into oh-3.35.7-dev"

谢代荣 — Sat, 05 Sep 2026 01:39:17 GMT

This reverts commit 29251776ded67c7b29334d5c7b86640bf5932d4d.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

Reapply "!1320 merge dmaDecode335 into oh-3.35.7-dev"

谢代荣 — Sat, 05 Sep 2026 01:39:17 GMT

This reverts commit 0f57287487b6775fb683937ce7beda50c005db57.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

Reapply "!1310 merge imageClearSend335 into oh-3.35.7-dev"

谢代荣 — Sat, 05 Sep 2026 01:39:17 GMT

This reverts commit f294461184e9d727873f181796b41c3d301c59af.

Signed-off-by: 谢代荣 xiedairong@h-partners.com

add: add ui integration_tests

HHHxm2 — Sat, 05 Sep 2026 01:38:34 GMT

Signed-off-by: HHHxm2 huangxingming2@huawei.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

test(Embedding): supplement arkts unit tests for touch, key event, text and view modules

zhong_ning — Fri, 04 Sep 2026 03:43:07 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com Co-authored-by: Cursor cursoragent@cursor.com

!1927 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Thu, 03 Sep 2026 10:59:30 GMT

chore: Branch oh-3.35.7-dev update engine.ohos.har.version and engine.ohos.version to 46fdf04930fdac4928789184f788857a1284c108

Created-by: xiedrsz Commit-by: 谢代荣 Merged-by: openharmony_ci Description: chore: Branch oh-3.35.7-dev update engine.ohos.har.version and engine.ohos.version to 46fdf04930fdac4928789184f788857a1284c108

See merge request: CPF-Flutter/flutter_flutter!1927

!1918 merge zhong_ut_335 into oh-3.35.7-dev

openharmony_ci — Thu, 03 Sep 2026 09:36:18 GMT

【3.35】test(Ohos): add app-library test runner and drop x64 emulator support

Created-by: zhong_ning Commit-by: zhong_ning Merged-by: openharmony_ci Description: ## Why are these changes being made? 引擎单元测试此前只能编成独立可执行程序在设备上运行,该形态要求 root 或模拟器 shell,商用非 root 真机无法执行,真机上的覆盖率验证一直无法进行。本改动为同一份测试源码增加了 shared_library 构建形态(由测试壳 App testing/ohos/unittest_ohos 通过 dlopen 加载执行),使全量 UT 与 llvm-cov 覆盖率在非 root 真机上可用;同时移除不再使用的 x64 模拟器测试链路。

Changelog

added 新增 shared_library target flutter_ohos_app_test 与 C 入口(FlutterOhosRunAllTests / FlutterOhosWriteCoverageProfile),并入库测试壳 App 工程 testing/ohos/unittest_ohos(napi 壳 + 使用文档)
added 新增 testing/run_ohos_unittest.py(由 unittest_app.py 演进):一条命令冷启动 App 执行全量测试、判定退出码、拉取 profraw 并生成 llvm-cov HTML 报告,参数对齐 run_tests.py(--type / --ohos-variant / --coverage 等,覆盖率默认开启)
removed 移除 x64 模拟器支持(OHOS_X64_UNITTEST 条件分支与 test_stubs/unittest_x64/ 桩目录),两种构建形态维护单一代码路径

Test Plan

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

Issue: #2575

See merge request: CPF-Flutter/flutter_flutter!1918

!1771 merge feat/new-gallery-ohos-perf-tasks into oh-3.35.7-dev

openharmony_ci — Thu, 03 Sep 2026 07:49:09 GMT

feat(devicelab): add new_gallery ohos perf test tasks

Created-by: z2036709353 Commit-by: zhanggong Merged-by: openharmony_ci Description:

Why are these changes being made?

The devicelab currently lacks new_gallery performance test tasks for the OHOS platform. The existing non-ohos variants (new_gallery__transition_perf, new_gallery_impeller__transition_perf, etc.) only run on Android/iOS. This PR adds 4 ohos task files to continuously monitor new_gallery frame build and rasterizer performance on OHOS devices, covering baseline rendering, Impeller, old zoom, and Crane scenarios.

Changelog

Added new_gallery__transition_perf_ohos devicelab task
Added new_gallery_impeller__transition_perf_ohos devicelab task
Added new_gallery_impeller_old_zoom__transition_perf_ohos devicelab task
Added new_gallery__crane_perf_ohos devicelab task
Optimized PerfTest.internalRun to skip Android manifest and iOS plist modifications on OHOS platform
Optimized NewGalleryPerfTest to accept createPlatforms parameter for OHOS tasks

Test Plan

All four tasks passed on a real OHOS device (6HK0125B07000225) with success: true and "All tests passed":

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[ ] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev
- [ ] oh-3.32.4-dev
- [ ] oh-3.27.4-dev
- [ ] 3.22.0-ohos
- [ ] dev

See merge request: CPF-Flutter/flutter_flutter!1771

chore: Branch oh-3.35.7-dev update engine.ohos.har.version and engine.ohos.version to 46fdf04930fdac4928789184f788857a1284c108

谢代荣 — Thu, 03 Sep 2026 02:44:39 GMT

Signed-off-by: 谢代荣 xiedairong@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

【3.35】test(Ohos): add app-library test runner and drop x64 emulator support

zhong_ning — Wed, 02 Sep 2026 07:44:25 GMT

Signed-off-by: zhong_ning zhong_ning@hoperun.com

!1901 merge fix/route_parameter-3.35 into oh-3.35.7-dev

openharmony_ci — Wed, 02 Sep 2026 04:06:21 GMT

fix: pass --route parameter to hdc aa start via --ps route Want parameter

Created-by: huangyouhua Commit-by: huangyouhua Merged-by: openharmony_ci Description: ## Why are these changes being made?

On OHOS platform, flutter run --route and flutter drive --route do not pass the --route parameter to the device. The OhosDevice.start_app method in ohos_device.dart receives the route parameter but never passes it to the hdc shell aa start command, causing PlatformDispatcher.instance.defaultRouteName to always return / instead of the specified route.

This is a backport of the fix from oh-3.41.9-dev to oh-3.35.7-dev. The same fix applies — Android passes route via --es route, iOS passes via --route=, and OHOS should pass via --ps route (Want parameter).

Related: #2563

Changelog

packages/flutter_tools/lib/src/ohos/ohos_device.dart: Added --ps route <route> to the hdc shell aa start command in start_app when route is not null, so that FlutterAbility.getInitialRoute() can read the route key from the launch Want parameters.
packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart: Added startApp using route test that verifies the aa start command includes --ps route /animation when route is passed to startApp. This test mirrors the existing iOS test at ios_device_start_prebuilt_test.dart.

Test Plan

Run the unit test: flutter test test/general.shard/ohos/ohos_device_test.dart
Verify on device: flutter run --route=/smuggle-it and check that PlatformDispatcher.instance.defaultRouteName returns /smuggle-it
Cross-platform verification: on Android, am start --es route /smuggle-it correctly passes route (no regression)

Test Run Result Summary

Unit test: flutter test test/general.shard/ohos/ohos_device_test.dart — All tests passed (1/1)
Device verification (OHOS): flutter run --route=/smuggle-it → PASS_BUG=false (route received correctly after fix)
Cross-platform (Android): am start --es route /smuggle-it → PASS_BUG=false (no regression)

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1901

!1904 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Tue, 01 Sep 2026 12:42:45 GMT

reset ohos_device.dart

Created-by: xiaolie5 Commit-by: xiaolieask Merged-by: openharmony_ci Description: reset ohos_device.dart Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.

List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

Pre-launch Checklist

[x] I read the Contributor Guide and followed the process outlined there for submitting PRs.
[x] I read the Tree Hygiene wiki page, which explains my responsibilities.
[x] I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
[x] I signed the CLA.
[x] I listed at least one issue that this PR fixes in the description above.
[x] I updated/added relevant documentation (doc comments with ///).
[x] I added new tests to check the change I am making, or this PR is test-exempt.
[x] I followed the breaking change policy and added Data Driven Fixes where supported.
[x] All existing and new tests are passing.

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

See merge request: CPF-Flutter/flutter_flutter!1904

reset ohos_device.dart

xiaolieask — Mon, 31 Aug 2026 08:50:40 GMT

Signed-off-by: xiaolieask xiaolie2@h-partners.com

AI[0%] Human Fixed[0%] Human[0%] AI Adopted[0%]

!1768 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Mon, 31 Aug 2026 08:22:56 GMT

add devicelab test

Created-by: xiaolie5 Commit-by: xiaolieask Merged-by: openharmony_ci Description:

Why are these changes being made?

add devicelab test

Changelog

added

Test Plan

this is test demo

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev
- [ ] oh-3.32.4-dev
- [ ] oh-3.27.4-dev
- [ ] 3.22.0-ohos
- [ ] dev

See merge request: CPF-Flutter/flutter_flutter!1768

fix: pass --route parameter to hdc aa start via --ps route Want parameter

huangyouhua — Mon, 31 Aug 2026 08:06:48 GMT

Signed-off-by: huangyouhua huangyouhua2@huawei.com

AI[100%] Human Fixed[0%] Human[0%] AI Adopted[100%] Co-authored-by: opencode (glm-5.2) ai@local

!1895 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Mon, 31 Aug 2026 06:59:37 GMT

chore: update skia_revision in DEPS_ohos

Created-by: zzx89757 Commit-by: zzx89757 Merged-by: openharmony_ci Description: ## Why are these changes being made?

Roll the skia dependency (fluttertpc_skia) pinned in DEPS_ohos to the new revision c63ae1a18b041424a68242a8c4c60ecdb4a957ed for the oh-3.35.7-dev branch, so the Flutter engine checks out the corresponding new version of skia.

Changelog

Updated skia_revision in DEPS_ohos:
- Old: a3661843de2338a48230fbd974c727205d121869
- New: c63ae1a18b041424a68242a8c4c60ecdb4a957ed

Test Plan

Run gclient sync to verify the new skia revision can be fetched successfully.
Build the OpenHarmony Flutter engine with the updated dependency and confirm the build passes.

Test Run Result Summary

TBD

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.35.7-dev

See merge request: CPF-Flutter/flutter_flutter!1895

add devicelab test

xiaolieask — Mon, 31 Aug 2026 02:38:16 GMT

Signed-off-by: xiaolieask xiaolie2@h-partners.com

AI[71%] Human Fixed[0%] Human[29%] AI Adopted[100%] Co-authored-by: opencode (glm-5.2) ai@local Co-authored-by: opencode (glm-5.3) ai@local

!1882 merge cherry-pick-noncode-prs-to-oh-3.35.7-release into oh-3.35.7-release

openharmony_ci — Mon, 31 Aug 2026 02:35:08 GMT

docs: 新增 Flutter-OH 路线图和 PR 贡献指南

Created-by: luqi_tan Commit-by: luqi_tan Merged-by: openharmony_ci Description: ## Why are these changes being made?

补齐 oh-3.35.7-release 分支缺失的文档内容。

关联 Issue: #2546

Changelog

added: docs/roadmap/Flutter-OH Roadmap.md（Flutter-OH 路线图）
added: docs/contributing/Flutter-OH-Contributor-PR.md（PR 贡献指南，含 commit template 使用和 githook 验证说明）

See merge request: CPF-Flutter/flutter_flutter!1882

chore: update skia_revision in DEPS_ohos and ci/resources/.gclient

zhouzhixiong — Mon, 31 Aug 2026 01:33:26 GMT

Signed-off-by: zzx89757 zhouzhixiong1@huawei.com

!1889 merge oh-3.35.7-release into oh-3.35.7-release

openharmony_ci — Sat, 29 Aug 2026 06:53:47 GMT

docs：更新首页README

Created-by: wwyang09 Commit-by: wenwenyang Merged-by: openharmony_ci Description: docs：更新首页README

See merge request: CPF-Flutter/flutter_flutter!1889

!1886 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Sat, 29 Aug 2026 06:51:46 GMT

docs：更新首页README

Created-by: wwyang09 Commit-by: wenwenyang Merged-by: openharmony_ci Description: docs：更新首页README

See merge request: CPF-Flutter/flutter_flutter!1886

docs：更新首页README

wenwenyang — Sat, 29 Aug 2026 04:27:17 GMT

Signed-off-by: wenwenyang yangwenwen7@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]

!1883 merge oh-3.35.7-dev into oh-3.35.7-dev

openharmony_ci — Sat, 29 Aug 2026 04:27:14 GMT

【3.35】test(Ohos): supplement ohos platform unit tests

Created-by: zhong_ning Commit-by: zhong_ning Merged-by: openharmony_ci Description: ## Why are these changes being made? 补充 OHOS 平台 C++ 单元测试覆盖率。

Changelog

added 新增 UT：
- engine/src/flutter/fml/platform/ohos/napi_util_unittests.cc
- engine/src/flutter/shell/platform/ohos/accessibility/multi_instance_xcomp_accessibility_unittests.cpp
- engine/src/flutter/shell/platform/ohos/accessibility/ohos_semantics_bridge_unittests.cpp
- engine/src/flutter/shell/platform/ohos/library_loader_unittests.cpp
- engine/src/flutter/shell/platform/ohos/napi/platform_view_ohos_napi_unittests.cpp
- engine/src/flutter/shell/platform/ohos/ohos_context_gl_skia_unittests.cpp
- engine/src/flutter/shell/platform/ohos/ohos_egl_surface_unittests.cpp
- engine/src/flutter/shell/platform/ohos/ohos_environment_gl_unittests.cpp
- engine/src/flutter/shell/platform/ohos/ohos_image_generator_unittests.cpp
- engine/src/flutter/shell/platform/ohos/ohos_surface_gl_skia_unittests.cpp
- engine/src/flutter/shell/platform/ohos/ohos_surface_software_unittests.cpp
- engine/src/flutter/shell/platform/ohos/ohos_xcomponent_adapter_unittests.cpp
- engine/src/flutter/shell/platform/ohos/platform_view_ohos_unittests.cpp
- engine/src/flutter/shell/platform/ohos/surface/ohos_native_window_unittests.cpp
- engine/src/flutter/shell/platform/ohos/surface/ohos_surface_unittests.cpp

Test Plan

Checklist

[x] No illegal compatibility changes are involved; if any are, they have passed the corresponding review.
[x] No performance issues are present or have been tested and there is no performance degradation.
[x] Compliant with the corresponding coding standards.
[x] No document updates are required, or the documents have been updated.
[x] In terms of testability requirements, necessary self-test cases, reasonable log recording or Trace information have been added.
[x] No illegal file introductions exist, including images and code, etc.
[x] The branches that need to be merged have been confirmed.
- [x] oh-3.41.9-dev

Issue: #2534

See merge request: CPF-Flutter/flutter_flutter!1883

docs：更新首页README

wenwenyang — Sat, 29 Aug 2026 04:25:47 GMT

Signed-off-by: wenwenyang yangwenwen7@h-partners.com

AI[0%] Human Fixed[0%] Human[100%] AI Adopted[0%]