merge: 合并 beta 最新代码并完成 dev2 缓冲卡死复评 (2026-09-12)

Verification: origin/beta@07fb0b5e13 无冲突合入；修复 Exo buffering 看门狗接线、非 Exo 作用域及 discontinuity 轮询顺序；:app:testMobileArm64_v8aDebugUnitTest 定向测试 BUILD SUCCESSFUL（87 actionable tasks） Task-Guard: beta-sync-review-dev2-20260912-followup
2026-10-02 06:16:35 +00:00 · 2026-09-12 18:12:35 +08:00 · 2026-09-12 18:12:35 +08:00 · 00c171160e
commit 00c171160e
parent 20dcf31245 07fb0b5e13
34 changed files with 485 additions and 618 deletions
--- a/FFMPEG_MODE_SWITCH.md
+++ b/FFMPEG_MODE_SWITCH.md
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDetailDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDetailDialog.java
--- a/app/src/leanback/res/layout/activity_setting_player.xml
+++ b/app/src/leanback/res/layout/activity_setting_player.xml
--- a/app/src/main/java/com/fongmi/android/tv/bean/Backup.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Backup.java
--- a/app/src/main/java/com/fongmi/android/tv/player/PlaybackExperimentPolicy.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/PlaybackExperimentPolicy.java
--- a/app/src/main/java/com/fongmi/android/tv/player/PlayerManager.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/PlayerManager.java
--- a/app/src/main/java/com/fongmi/android/tv/setting/PlayerSetting.java
+++ b/app/src/main/java/com/fongmi/android/tv/setting/PlayerSetting.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java
--- a/app/src/main/res/layout/dialog_episode_detail.xml
+++ b/app/src/main/res/layout/dialog_episode_detail.xml
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeDetailDialog.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeDetailDialog.java
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
--- a/app/src/mobile/res/layout/fragment_setting_player.xml
+++ b/app/src/mobile/res/layout/fragment_setting_player.xml
--- a/app/src/mobile/res/values/integers.xml
+++ b/app/src/mobile/res/values/integers.xml
--- a/app/src/test/java/com/fongmi/android/tv/player/PlaybackExperimentPolicyTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/PlaybackExperimentPolicyTest.java
--- a/app/src/test/java/com/fongmi/android/tv/player/PlayerManagerLifecycleSourceTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/PlayerManagerLifecycleSourceTest.java
--- a/app/src/test/java/com/fongmi/android/tv/player/PlayerManagerTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/PlayerManagerTest.java
--- a/app/src/test/java/com/fongmi/android/tv/player/exo/ExoBufferingStallWatchdogTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/exo/ExoBufferingStallWatchdogTest.java
--- a/app/src/test/java/com/fongmi/android/tv/setting/PlayerDisplaySettingSyncTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/setting/PlayerDisplaySettingSyncTest.java
--- a/app/src/test/java/com/fongmi/android/tv/setting/PlayerSettingTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/setting/PlayerSettingTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivityLayoutTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivityLayoutTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/VideoActivityLayoutTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/VideoActivityLayoutTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/dialog/EpisodeDetailDialogThemeTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/dialog/EpisodeDetailDialogThemeTest.java
--- a/docs/E-ROLLBACK-exo-upstream-mode.md
+++ b/docs/E-ROLLBACK-exo-upstream-mode.md
--- a/docs/E-SP8-exo-short-drama-queue.md
+++ b/docs/E-SP8-exo-short-drama-queue.md
--- a/docs/beta-sync-review-dev1-20260912.md
+++ b/docs/beta-sync-review-dev1-20260912.md
--- a/docs/beta-sync-review-dev2-20260912.md
+++ b/docs/beta-sync-review-dev2-20260912.md
--- a/docs/beta-sync-review-dev4-20260912.md
+++ b/docs/beta-sync-review-dev4-20260912.md