diff options
| author | Xin Li <delphij@google.com> | 2024-06-13 10:48:56 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-06-13 10:48:56 -0700 |
| commit | 9512c1724c673dd20062ef07c211aa4e635a54bd (patch) | |
| tree | 9eb673dba0458494b877f22f9d27529aa123e07f | |
| parent | 0dec2f182797a5d31882162dbc6d282d64f22f69 (diff) | |
| parent | 9bca45b0d27e609ce73b5d8679bc389afe2f8d0b (diff) | |
Merge Android 14 QPR3 to AOSP main
Bug: 346855327
Merged-In: I6b0728bd7928fe8fb4840fac5d790bc9f1c00f8c
Change-Id: Idb192b0abdc5ac476ff90aa6a377480671ab7260
| -rw-r--r-- | vendor/google/seapp_contexts | 1 | ||||
| -rw-r--r-- | vendor/google/service.te | 1 | ||||
| -rw-r--r-- | vendor/google/service_contexts | 2 | ||||
| -rw-r--r-- | vendor/google/vndservice.te | 1 | ||||
| -rw-r--r-- | vendor/google/vndservice_contexts | 1 | ||||
| -rw-r--r-- | vendor/qcom/common/mediacodec.te | 1 |
6 files changed, 5 insertions, 2 deletions
diff --git a/vendor/google/seapp_contexts b/vendor/google/seapp_contexts index 680d4e6e..71f4cb57 100644 --- a/vendor/google/seapp_contexts +++ b/vendor/google/seapp_contexts @@ -7,6 +7,7 @@ user=_app isPrivApp=true name=com.google.android.grilservice domain=grilservice_ # Domain for Modem Diagnostic System user=_app seinfo=mds name=com.google.mds domain=modem_diagnostic_app type=app_data_file levelFrom=user +user=_app seinfo=platform name=com.google.mds domain=modem_diagnostic_app type=app_data_file levelFrom=user # Domain for GoogleCBRS app user=_app seinfo=platform name=com.google.googlecbrs domain=cbrs_setup_app type=app_data_file levelFrom=user diff --git a/vendor/google/service.te b/vendor/google/service.te index cc65c0ea..27abf848 100644 --- a/vendor/google/service.te +++ b/vendor/google/service.te @@ -2,3 +2,4 @@ type hal_pixel_display_service, service_manager_type, hal_service_type; type hal_wifi_ext_service, service_manager_type, hal_service_type; type hal_wireless_charger_service, hal_service_type, protected_service, service_manager_type; +type eco_service, service_manager_type; diff --git a/vendor/google/service_contexts b/vendor/google/service_contexts index a14f133a..40989edf 100644 --- a/vendor/google/service_contexts +++ b/vendor/google/service_contexts @@ -3,3 +3,5 @@ com.google.hardware.pixel.display.IDisplay/default u: vendor.google.wifi_ext.IWifiExt/default u:object_r:hal_wifi_ext_service:s0 vendor.google.wireless_charger.IWirelessCharger/default u:object_r:hal_wireless_charger_service:s0 + +media.ecoservice u:object_r:eco_service:s0 diff --git a/vendor/google/vndservice.te b/vendor/google/vndservice.te index 8c080d9d..d67705ff 100644 --- a/vendor/google/vndservice.te +++ b/vendor/google/vndservice.te @@ -1,2 +1 @@ type rls_service, vndservice_manager_type; -type eco_service, vndservice_manager_type; diff --git a/vendor/google/vndservice_contexts b/vendor/google/vndservice_contexts index 512728a6..6e449dec 100644 --- a/vendor/google/vndservice_contexts +++ b/vendor/google/vndservice_contexts @@ -1,2 +1 @@ rlsservice u:object_r:rls_service:s0 -media.ecoservice u:object_r:eco_service:s0 diff --git a/vendor/qcom/common/mediacodec.te b/vendor/qcom/common/mediacodec.te index 51dcb689..4a5d2a3c 100644 --- a/vendor/qcom/common/mediacodec.te +++ b/vendor/qcom/common/mediacodec.te @@ -5,5 +5,6 @@ add_service(mediacodec, eco_service) get_prop(mediacodec, vendor_ecoservice_prop) allow mediacodec hal_camera_default:binder call; r_dir_file(mediacodec, sysfs_soc) +binder_use(mediacodec) dontaudit mediacodec sysfs_msm_subsys:dir search; |