From a1ba5a9f5a972191e25993917c4fb38d6beaf1ad Mon Sep 17 00:00:00 2001 From: Aleks Rozman Date: Tue, 22 Sep 2020 18:25:48 +0000 Subject: [PATCH] Revert "Add GNSS AIDL interfaces (system/sepolicy)" This reverts commit d5f59b1b77a9dbce543eb90f1ba38bace37919db. Reason for revert: b/169150373 Change-Id: I3d5e20400ea8ee0e9ae439497245c09a13aaa716 --- private/compat/30.0/30.0.ignore.cil | 1 - private/service_contexts | 1 - public/hal_gnss.te | 4 ---- public/service.te | 1 - vendor/file_contexts | 1 - 5 files changed, 8 deletions(-) diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil index cce2c22c8..894cf61a6 100644 --- a/private/compat/30.0/30.0.ignore.cil +++ b/private/compat/30.0/30.0.ignore.cil @@ -14,7 +14,6 @@ hal_fingerprint_service gnss_device hal_dumpstate_config_prop - hal_gnss_service hal_power_stats_service keystore2_key_contexts_file location_time_zone_manager_service diff --git a/private/service_contexts b/private/service_contexts index 026a5b545..7d36973e6 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -1,5 +1,4 @@ android.hardware.biometrics.fingerprint.IFingerprint/default u:object_r:hal_fingerprint_service:s0 -android.hardware.gnss.IGnss/default u:object_r:hal_gnss_service:s0 android.hardware.identity.IIdentityCredentialStore/default u:object_r:hal_identity_service:s0 android.hardware.light.ILights/default u:object_r:hal_light_service:s0 android.hardware.power.IPower/default u:object_r:hal_power_service:s0 diff --git a/public/hal_gnss.te b/public/hal_gnss.te index 832bc8d24..9bfc4ec36 100644 --- a/public/hal_gnss.te +++ b/public/hal_gnss.te @@ -3,7 +3,3 @@ binder_call(hal_gnss_client, hal_gnss_server) binder_call(hal_gnss_server, hal_gnss_client) hal_attribute_hwservice(hal_gnss, hal_gnss_hwservice) -hal_attribute_service(hal_gnss, hal_gnss_service) -binder_call(hal_gnss_server, servicemanager) -binder_call(hal_gnss_client, servicemanager) - diff --git a/public/service.te b/public/service.te index 076ccfaa6..2325292a3 100644 --- a/public/service.te +++ b/public/service.te @@ -213,7 +213,6 @@ type emergency_affordance_service, system_server_service, service_manager_type; ### type hal_fingerprint_service, vendor_service, service_manager_type; -type hal_gnss_service, vendor_service, service_manager_type; type hal_identity_service, vendor_service, service_manager_type; type hal_light_service, vendor_service, service_manager_type; type hal_power_service, vendor_service, service_manager_type; diff --git a/vendor/file_contexts b/vendor/file_contexts index 9b9025171..a721fd523 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -29,7 +29,6 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.cas@1\.[0-2]-service-lazy u:object_r:hal_cas_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.dumpstate@1\.[0-1]-service\.example u:object_r:hal_dumpstate_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.gatekeeper@1\.0-service u:object_r:hal_gatekeeper_default_exec:s0 -/(vendor|system/vendor)/bin/hw/android\.hardware\.gnss-service.example u:object_r:hal_gnss_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.gnss@[0-9]\.[0-9]-service u:object_r:hal_gnss_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.graphics\.allocator@2\.0-service u:object_r:hal_graphics_allocator_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.graphics\.allocator@3\.0-service u:object_r:hal_graphics_allocator_default_exec:s0