summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-27 13:12:06 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-27 13:12:06 +0000
commit2e2f665b0983dc482da92e35f3287d223bca22f9 (patch)
treeb3500eb5ccd0fc360f3f4439b74a87bc4b05daa4
parentf2488e8384bcf1bd007331693d273b934447c797 (diff)
parentc9be610c78e0fb9d00654b50616e5dba63fb7630 (diff)
Snap for 8505378 from c9be610c78e0fb9d00654b50616e5dba63fb7630 to mainline-go-art-release
Change-Id: Ib45974783136d495edfca990e86943a2defaf5d2
-rw-r--r--full.mk1
-rw-r--r--sepolicy/file.te1
-rw-r--r--sepolicy/genfs_contexts1
-rw-r--r--sepolicy/kernel.te6
-rw-r--r--sepolicy/surfaceflinger.te1
-rw-r--r--sepolicy/system_server.te2
6 files changed, 9 insertions, 3 deletions
diff --git a/full.mk b/full.mk
index 96c3f9f..fc1c0be 100644
--- a/full.mk
+++ b/full.mk
@@ -146,7 +146,6 @@ PRODUCT_PACKAGES += \
# Build default bluetooth a2dp and usb audio HALs
PRODUCT_PACKAGES += \
- audio.a2dp.default \
audio.bluetooth.default \
audio.usb.default \
audio.r_submix.default
diff --git a/sepolicy/file.te b/sepolicy/file.te
index e5a0bd1..b149497 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -1,4 +1,3 @@
-type sysfs_gpu, fs_type, sysfs_type;
type sysfs_mss, fs_type, sysfs_type;
type sysfs_rmtfs, fs_type, sysfs_type;
type sysfs_remoteproc, fs_type, sysfs_type;
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
index e8ddb12..2a50d9c 100644
--- a/sepolicy/genfs_contexts
+++ b/sepolicy/genfs_contexts
@@ -1,4 +1,5 @@
genfscon sysfs /devices/platform/88f00000.memory/rmtfs u:object_r:sysfs_rmtfs:s0
+genfscon sysfs /devices/platform/88f00000.rmtfs/rmtfs u:object_r:sysfs_rmtfs:s0
genfscon sysfs /devices/platform/remoteproc-adsp/remoteproc u:object_r:sysfs_remoteproc:s0
genfscon sysfs /devices/platform/remoteproc-cdsp/remoteproc u:object_r:sysfs_remoteproc:s0
genfscon sysfs /devices/platform/soc@0/4080000.remoteproc u:object_r:sysfs_remoteproc:s0
diff --git a/sepolicy/kernel.te b/sepolicy/kernel.te
index 3fad122..176d6f6 100644
--- a/sepolicy/kernel.te
+++ b/sepolicy/kernel.te
@@ -2,6 +2,10 @@
allow kernel device:chr_file { create setattr };
allow kernel device:dir { add_name create write };
allow kernel self:capability mknod;
-allow kernel vendor_file:file { open read };
+allow kernel vendor_file:file { open read getattr};
+allow kernel vendor_file:dir read;
allow kernel self:system module_request;
allow vendor_init kernel:system module_request;
+allow kernel sepolicy_file:file getattr;
+allow kernel system_bootstrap_lib_file:dir getattr;
+allow kernel system_bootstrap_lib_file:file getattr;
diff --git a/sepolicy/surfaceflinger.te b/sepolicy/surfaceflinger.te
index 17b66a8..9bffa3f 100644
--- a/sepolicy/surfaceflinger.te
+++ b/sepolicy/surfaceflinger.te
@@ -1 +1,2 @@
gpu_access(surfaceflinger)
+allow surfaceflinger vendor_file:dir read;
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
index 80957cc..e801436 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/system_server.te
@@ -1 +1,3 @@
gpu_access(system_server)
+allow system_server wifi_hal_prop:file {open read getattr map};
+allow system_server vendor_file:dir read;