From a1ea786e36c47e7052457b2919f4b1719d90fc3d Mon Sep 17 00:00:00 2001
From: oxmc <67136658+oxmc@users.noreply.github.com>
Date: Wed, 22 Oct 2025 01:43:59 -0700
Subject: [PATCH] Update to upstream

---
 aosp_rpi4_tv.mk                    | 2 +-
 boot/config.txt                    | 1 +
 device.mk                          | 6 +++---
 framework_compatibility_matrix.xml | 5 ++---
 sepolicy/file_contexts             | 6 ------
 vendor.prop                        | 1 +
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/aosp_rpi4_tv.mk b/aosp_rpi4_tv.mk
index 607ac0f..da8846d 100644
--- a/aosp_rpi4_tv.mk
+++ b/aosp_rpi4_tv.mk
@@ -9,7 +9,7 @@ DEVICE_PATH := device/brcm/rpi4
 # Inherit device configuration
 $(call inherit-product, device/brcm/rpi4/device.mk)
 
-PRODUCT_AAPT_PREF_CONFIG := tvdpi
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
 PRODUCT_CHARACTERISTICS := tv
 
 $(call inherit-product, device/google/atv/products/atv_base.mk)
diff --git a/boot/config.txt b/boot/config.txt
index 56f203f..3c72927 100644
--- a/boot/config.txt
+++ b/boot/config.txt
@@ -20,6 +20,7 @@ disable_overscan=1
 
 # Display panel
 #dtoverlay=vc4-kms-dsi-7inch
+#dtoverlay=vc4-kms-dsi-ili9881-5inch
 #dtoverlay=vc4-kms-dsi-ili9881-7inch
 
 # Graphics acceleration
diff --git a/device.mk b/device.mk
index ca5526a..cee8595 100644
--- a/device.mk
+++ b/device.mk
@@ -104,7 +104,7 @@ PRODUCT_COPY_FILES += \
 
 # FFmpeg
 PRODUCT_PACKAGES += \
-    android.hardware.media.c2@1.2-service-ffmpeg
+    com.android.hardware.media.c2.ffmpeg
 
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/media/media_codecs_ffmpeg_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_ffmpeg_c2.xml \
@@ -223,8 +223,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SOONG_NAMESPACES += external/v4l2_codec2
 
 PRODUCT_PACKAGES += \
-    android.hardware.media.c2@1.2-service-v4l2 \
-    libc2plugin_store
+    android.hardware.media.c2-default-seccomp_policy \
+    com.android.hardware.media.c2.v4l2
 
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/media/media_codecs_v4l2_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_v4l2_c2_video.xml \
diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
index e2a73b5..57751a3 100644
--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -1,8 +1,7 @@
 <compatibility-matrix version="1.0" type="framework">
-    <hal format="hidl" optional="true">
+    <hal format="aidl">
         <name>android.hardware.media.c2</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
+        <version>1</version>
         <interface>
             <name>IComponentStore</name>
             <instance>ffmpeg</instance>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 7d1ed02..81ee882 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -8,9 +8,6 @@
 # DRM
 /data/vendor/mediadrm(/.*)?  u:object_r:mediadrm_vendor_data_file:s0
 
-# FFmpeg
-/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-ffmpeg  u:object_r:mediacodec_exec:s0
-
 # Graphics
 /dev/dri(/.*)?                                                                   u:object_r:gpu_device:s0
 /vendor/bin/hw/android\.hardware\.graphics\.allocator-service\.minigbm_gbm_mesa  u:object_r:hal_graphics_allocator_default_exec:s0
@@ -30,6 +27,3 @@
 /dev/block/mmcblk0p2  u:object_r:system_block_device:s0
 /dev/block/mmcblk0p3  u:object_r:system_block_device:s0
 /dev/block/mmcblk0p4  u:object_r:userdata_block_device:s0
-
-# V4L2
-/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-v4l2(.*)?  u:object_r:mediacodec_exec:s0
diff --git a/vendor.prop b/vendor.prop
index 89ae3d0..f1ec56b 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -67,6 +67,7 @@ ro.lockscreen.disable.default=true
 
 # Media
 debug.stagefright.c2inputsurface=-1
+media.c2.hal.selection=aidl
 
 # MGLRU
 persist.device_config.mglru_native.lru_gen_config=core