summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2017-07-30 08:59:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-30 08:59:47 +0000
commitdd180bf480726f66024f875e32b30fc71e9b45e2 (patch)
tree76eaa856dc1f16d97a28c8d54576fe73f9c303cd
parentbda7846d9bc0cec7084103d945fe58643089af99 (diff)
parentda1c0f3d9da42569ba68cd1a84440ac9210ca0c2 (diff)
downloadwahoo-dd180bf480726f66024f875e32b30fc71e9b45e2.tar.gz
Merge "Remove service_contexts." into oc-dr1-dev
am: da1c0f3d9d Change-Id: I2c0ae2ad090f81c548445fbeaac62cfe03e123f0
-rw-r--r--sepolicy/private/service_contexts1
-rw-r--r--sepolicy/vendor/radio.te1
-rw-r--r--sepolicy/vendor/service.te1
-rw-r--r--sepolicy/vendor/service_contexts3
4 files changed, 1 insertions, 5 deletions
diff --git a/sepolicy/private/service_contexts b/sepolicy/private/service_contexts
index 3e53f9a5..20fa4e6e 100644
--- a/sepolicy/private/service_contexts
+++ b/sepolicy/private/service_contexts
@@ -1,3 +1,4 @@
qti.ims.ext u:object_r:radio_service:s0
cneservice u:object_r:cne_service:s0
uce u:object_r:uce_service:s0
+rcs u:object_r:radio_service:s0
diff --git a/sepolicy/vendor/radio.te b/sepolicy/vendor/radio.te
index 2beb473c..bd704c21 100644
--- a/sepolicy/vendor/radio.te
+++ b/sepolicy/vendor/radio.te
@@ -13,7 +13,6 @@ allow radio vnd_ims_radio_hwservice:hwservice_manager find;
allow radio vnd_qcrilhook_hwservice:hwservice_manager find;
allow radio hal_imsrtp_hwservice:hwservice_manager find;
-add_service(radio, radio_service)
allow radio {
mediaextractor_service
mediacodec_service
diff --git a/sepolicy/vendor/service.te b/sepolicy/vendor/service.te
deleted file mode 100644
index 2b24fe4b..00000000
--- a/sepolicy/vendor/service.te
+++ /dev/null
@@ -1 +0,0 @@
-type imsuce_service, service_manager_type;
diff --git a/sepolicy/vendor/service_contexts b/sepolicy/vendor/service_contexts
index ad75ea18..e69de29b 100644
--- a/sepolicy/vendor/service_contexts
+++ b/sepolicy/vendor/service_contexts
@@ -1,3 +0,0 @@
-rcs u:object_r:radio_service:s0
-com.fingerprints.extension.IFingerprintNavigation u:object_r:fingerprint_service:s0
-com.qualcomm.qti.uceservice u:object_r:imsuce_service:s0