From d181bc2c16d828689a50b248c3afaac35faa6779 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 20 Aug 2019 14:38:47 -0700 Subject: [PATCH] Remove mediacodec_service. Since this service no longer exists. Fix: 80317992 Test: TH, codesearch. Change-Id: I257c8cc3dba657d98f19eb61b36aae147afea393 --- private/compat/29.0/29.0.cil | 1 + private/ephemeral_app.te | 1 - private/nfc.te | 1 - private/platform_app.te | 1 - private/priv_app.te | 1 - private/service_contexts | 1 - private/system_server.te | 1 - private/untrusted_app_all.te | 1 - public/mediaserver.te | 1 - public/service.te | 1 - 10 files changed, 1 insertion(+), 9 deletions(-) diff --git a/private/compat/29.0/29.0.cil b/private/compat/29.0/29.0.cil index 01e86055f..8a0f73f7e 100644 --- a/private/compat/29.0/29.0.cil +++ b/private/compat/29.0/29.0.cil @@ -1,5 +1,6 @@ ;; types removed from current policy (type hal_wifi_offload_hwservice) +(type mediacodec_service) (type perfprofd_data_file) (type perfprofd_service) diff --git a/private/ephemeral_app.te b/private/ephemeral_app.te index 1283e2178..ecedaba0a 100644 --- a/private/ephemeral_app.te +++ b/private/ephemeral_app.te @@ -39,7 +39,6 @@ allow ephemeral_app audioserver_service:service_manager find; allow ephemeral_app cameraserver_service:service_manager find; allow ephemeral_app mediaserver_service:service_manager find; allow ephemeral_app mediaextractor_service:service_manager find; -allow ephemeral_app mediacodec_service:service_manager find; allow ephemeral_app mediametrics_service:service_manager find; allow ephemeral_app mediadrmserver_service:service_manager find; allow ephemeral_app drmserver_service:service_manager find; diff --git a/private/nfc.te b/private/nfc.te index 5e8567291..2e48eef04 100644 --- a/private/nfc.te +++ b/private/nfc.te @@ -15,7 +15,6 @@ allow nfc nfc_data_file:notdevfile_class_set create_file_perms; # SoundPool loading and playback allow nfc audioserver_service:service_manager find; allow nfc drmserver_service:service_manager find; -allow nfc mediacodec_service:service_manager find; allow nfc mediametrics_service:service_manager find; allow nfc mediaextractor_service:service_manager find; allow nfc mediaserver_service:service_manager find; diff --git a/private/platform_app.te b/private/platform_app.te index bbba1d95c..8c2128df7 100644 --- a/private/platform_app.te +++ b/private/platform_app.te @@ -58,7 +58,6 @@ allow platform_app drmserver_service:service_manager find; allow platform_app mediaserver_service:service_manager find; allow platform_app mediametrics_service:service_manager find; allow platform_app mediaextractor_service:service_manager find; -allow platform_app mediacodec_service:service_manager find; allow platform_app mediadrmserver_service:service_manager find; allow platform_app persistent_data_block_service:service_manager find; allow platform_app radio_service:service_manager find; diff --git a/private/priv_app.te b/private/priv_app.te index 5768f009c..f9409b9b4 100644 --- a/private/priv_app.te +++ b/private/priv_app.te @@ -37,7 +37,6 @@ allow priv_app system_api_service:service_manager find; allow priv_app audioserver_service:service_manager find; allow priv_app cameraserver_service:service_manager find; allow priv_app drmserver_service:service_manager find; -allow priv_app mediacodec_service:service_manager find; allow priv_app mediadrmserver_service:service_manager find; allow priv_app mediaextractor_service:service_manager find; allow priv_app mediametrics_service:service_manager find; diff --git a/private/service_contexts b/private/service_contexts index e6d18b971..6cb59e80c 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -113,7 +113,6 @@ media.log u:object_r:audioserver_service:s0 media.player u:object_r:mediaserver_service:s0 media.metrics u:object_r:mediametrics_service:s0 media.extractor u:object_r:mediaextractor_service:s0 -media.codec u:object_r:mediacodec_service:s0 media.resource_manager u:object_r:mediaserver_service:s0 media.sound_trigger_hw u:object_r:audioserver_service:s0 media.drm u:object_r:mediadrmserver_service:s0 diff --git a/private/system_server.te b/private/system_server.te index 71bf6fe4a..cfd536a1f 100644 --- a/private/system_server.te +++ b/private/system_server.te @@ -714,7 +714,6 @@ allow system_server keystore_service:service_manager find; allow system_server mediaserver_service:service_manager find; allow system_server mediametrics_service:service_manager find; allow system_server mediaextractor_service:service_manager find; -allow system_server mediacodec_service:service_manager find; allow system_server mediadrmserver_service:service_manager find; allow system_server netd_service:service_manager find; allow system_server nfc_service:service_manager find; diff --git a/private/untrusted_app_all.te b/private/untrusted_app_all.te index de047da9f..fd605c7e8 100644 --- a/private/untrusted_app_all.te +++ b/private/untrusted_app_all.te @@ -92,7 +92,6 @@ allow untrusted_app_all cameraserver_service:service_manager find; allow untrusted_app_all drmserver_service:service_manager find; allow untrusted_app_all mediaserver_service:service_manager find; allow untrusted_app_all mediaextractor_service:service_manager find; -allow untrusted_app_all mediacodec_service:service_manager find; allow untrusted_app_all mediametrics_service:service_manager find; allow untrusted_app_all mediadrmserver_service:service_manager find; allow untrusted_app_all nfc_service:service_manager find; diff --git a/public/mediaserver.te b/public/mediaserver.te index 70d0a55b2..02a0eb072 100644 --- a/public/mediaserver.te +++ b/public/mediaserver.te @@ -74,7 +74,6 @@ allow mediaserver cameraserver_service:service_manager find; allow mediaserver batterystats_service:service_manager find; allow mediaserver drmserver_service:service_manager find; allow mediaserver mediaextractor_service:service_manager find; -allow mediaserver mediacodec_service:service_manager find; allow mediaserver mediametrics_service:service_manager find; allow mediaserver media_session_service:service_manager find; allow mediaserver permission_service:service_manager find; diff --git a/public/service.te b/public/service.te index 3a2e4dfc7..7c420e01a 100644 --- a/public/service.te +++ b/public/service.te @@ -20,7 +20,6 @@ type lpdump_service, service_manager_type; type mediaserver_service, service_manager_type; type mediametrics_service, service_manager_type; type mediaextractor_service, service_manager_type; -type mediacodec_service, service_manager_type; type mediadrmserver_service, service_manager_type; type netd_service, service_manager_type; type nfc_service, service_manager_type;