From 602cf92d0d79b919adbc1a8c14bf27a2ddc77cb8 Mon Sep 17 00:00:00 2001
From: Brendan Szymanski <hello@bscubed.dev>
Date: Thu, 16 Jul 2026 13:29:36 -0400
Subject: [PATCH] Add forked frameworks/base with global display mode fix

Carries a one-line fix for an AOSP Android 16 regression (95bb63c87eca)
where DisplayManagerService early-returns on the global user-preferred
display mode path (INVALID_DISPLAY has no DisplayDevice), making the
TvSettings resolution/refresh-rate pickers silent no-ops. Unfixed
upstream as of android16-qpr2-release.
---
 manifest.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/manifest.xml b/manifest.xml
index fd07002..afebc60 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -39,6 +39,17 @@
            name="android_external_mesa3d_panfrost"
            remote="bscubed" />
 
+  <!-- Framework: carries a fix for an AOSP Android 16 regression (commit
+       95bb63c87eca) where DisplayManagerService rejects the GLOBAL user-preferred
+       display mode (displayId == INVALID_DISPLAY has no DisplayDevice, so a null
+       guard early-returns), making the TvSettings Resolution/refresh-rate pickers
+       a silent no-op. Unfixed upstream as of android16-qpr2-release. -->
+  <remove-project name="LineageOS/android_frameworks_base" />
+  <project path="frameworks/base"
+           name="android_frameworks_base"
+           remote="bscubed"
+           groups="pdk-cw-fs,pdk-fs,sysui-studio" />
+
   <!-- Media / FFmpeg -->
   <remove-project name="platform/external/libudev-zero" />
   <project path="external/ffmpeg"