commit 541b51e17b031ad3ca99769328c4d941f2c70f8a
author Thiébaud Weksteen <tweek@google.com> Fri Oct 18 00:56:10 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 18 00:56:10 2024 +0000
tree fca78f123462a41d63ae1cab1a946dd1cd65b6da
parent 172a703bbf66bbf5fd05978c51ac6537b3013fbd
parent 7561dcc936ca7ca27f4a2a1f915d17b5d1d2dbd4

Merge "Remove duplicate service entries" into main

whitechapel/vendor/google/hwservice_contexts

diff --git a/whitechapel/vendor/google/hwservice_contexts b/whitechapel/vendor/google/hwservice_contexts
index baf720b..577a678 100644
--- a/whitechapel/vendor/google/hwservice_contexts
+++ b/whitechapel/vendor/google/hwservice_contexts
@@ -11,7 +11,6 @@
 vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal        u:object_r:hal_exynos_rild_hwservice:s0
 
 # VIDEO
-android.hardware.media.c2::IComponentStore                      u:object_r:hal_codec2_hwservice:s0
 android.hardware.media.c2::IConfigurable                        u:object_r:hal_codec2_hwservice:s0
 
 # GRIL HAL

whitechapel/vendor/google/service_contexts

diff --git a/whitechapel/vendor/google/service_contexts b/whitechapel/vendor/google/service_contexts
index 2536252..074dedf 100644
--- a/whitechapel/vendor/google/service_contexts
+++ b/whitechapel/vendor/google/service_contexts
@@ -3,4 +3,3 @@
 android.hardware.drm.IDrmFactory/widevine                  u:object_r:hal_drm_service:s0
 vendor.google.wireless_charger.IWirelessCharger/default                      u:object_r:hal_wireless_charger_service:s0
 rlsservice                                                 u:object_r:rls_service:s0
-android.hardware.media.c2.IComponentStore/default1                    u:object_r:hal_codec2_service:s0