summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2016-10-13 18:12:36 +0200
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2016-11-11 00:36:25 +0100
commitffc51a16ca3c2a602d2479ceb3981ebc8d756103 (patch)
tree217aad87b7372de000e86fe218c0d1b2b6b3c16b
parent094cffdb3e1593bc9f74bf1c6adc2c1a64a9d117 (diff)
downloadcommon-ffc51a16ca3c2a602d2479ceb3981ebc8d756103.tar.gz
Adapt to upstream's sdcard_internal/sdcard_external rename
Between AOSP M and AOSP N, upstream renamed sdcard_internal to fuse and sdcard_external to vfat (Commit 374b2a198a0b2872e32f4579337796a539fd168d in platform/system/sepolicy) Follow the new naming conventions here. Change-Id: I19e29cd0185d37b05af3aed50abe657bb3a0e841 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--sepolicy/atcp.te8
-rw-r--r--sepolicy/debuggerd.te4
-rw-r--r--sepolicy/drmserver.te2
-rw-r--r--sepolicy/mediaserver.te4
-rw-r--r--sepolicy/mobile_log_d.te4
-rw-r--r--sepolicy/netdiag.te4
-rw-r--r--sepolicy/nfc.te8
-rw-r--r--sepolicy/radio.te4
-rw-r--r--sepolicy/sn.te2
9 files changed, 20 insertions, 20 deletions
diff --git a/sepolicy/atcp.te b/sepolicy/atcp.te
index c40a3da..ac23af3 100644
--- a/sepolicy/atcp.te
+++ b/sepolicy/atcp.te
@@ -346,8 +346,8 @@ allow atcp mnt_media_rw_file:dir search;
# Operation : Migration
# Purpose : for L early bring-up
allow atcp kernel:system syslog_mod;
-allow atcp sdcard_internal:dir create_dir_perms;
-allow atcp sdcard_internal:file create_file_perms;
+allow atcp fuse:dir create_dir_perms;
+allow atcp fuse:file create_file_perms;
allow atcp platform_app:fd use;
allow atcp platform_app_tmpfs:file write;
#allow atcp unlabeled:lnk_file read;
@@ -420,8 +420,8 @@ allow atcp mnt_media_rw_file:lnk_file create_file_perms;
# Operation : Migration
# Purpose : for L early bring-up
allow atcp shell_exec:file execute_no_trans;
-allow atcp sdcard_internal:dir { write search read create open add_name };
-allow atcp sdcard_internal:file { write create open getattr };
+allow atcp fuse:dir { write search read create open add_name };
+allow atcp fuse:file { write create open getattr };
allow atcp self:packet_socket { write ioctl setopt read getopt create };
allow atcp fuse:dir { remove_name write search read remove_name open add_name create};
allow atcp fuse:file { rename write getattr read create open unlink};
diff --git a/sepolicy/debuggerd.te b/sepolicy/debuggerd.te
index 68b76f3..62fd389 100644
--- a/sepolicy/debuggerd.te
+++ b/sepolicy/debuggerd.te
@@ -39,8 +39,8 @@ allow debuggerd shell_exec:file { execute execute_no_trans };
allow debuggerd dex2oat_exec:file { execute execute_no_trans };
# aee db dir and db files
-allow debuggerd sdcard_internal:dir create_dir_perms;
-allow debuggerd sdcard_internal:file create_file_perms;
+allow debuggerd fuse:dir create_dir_perms;
+allow debuggerd fuse:file create_file_perms;
#data/anr
allow debuggerd anr_data_file:dir create_dir_perms;
diff --git a/sepolicy/drmserver.te b/sepolicy/drmserver.te
index 92aafb8..f5f575f 100644
--- a/sepolicy/drmserver.te
+++ b/sepolicy/drmserver.te
@@ -13,7 +13,7 @@ allow drmserver platform_app:dir search;
allow drmserver platform_app:file { read getattr open };
allow drmserver property_socket:sock_file write;
allow drmserver radio_data_file:file { read getattr open };
-allow drmserver sdcard_internal:file open;
+allow drmserver fuse:file open;
#allow drmserver tmpfs:lnk_file read;
#Add by rui.hu
diff --git a/sepolicy/mediaserver.te b/sepolicy/mediaserver.te
index a87536b..4a66e53 100644
--- a/sepolicy/mediaserver.te
+++ b/sepolicy/mediaserver.te
@@ -30,8 +30,8 @@ allow mediaserver self:capability sys_nice;
# Date : WK14.32
# Operation : Migration
# Purpose : Set audio driver permission to access SD card for debug purpose and accss NVRam.
-allow mediaserver sdcard_internal:dir { write create add_name };
-allow mediaserver sdcard_internal:file create;
+allow mediaserver fuse:dir { write create add_name };
+allow mediaserver fuse:file create;
allow mediaserver nvram_data_file:dir { add_name write search };
allow mediaserver nvram_data_file:file { write getattr setattr read create open };
allow mediaserver nvram_data_file:lnk_file read;
diff --git a/sepolicy/mobile_log_d.te b/sepolicy/mobile_log_d.te
index 5faf0e4..148039d 100644
--- a/sepolicy/mobile_log_d.te
+++ b/sepolicy/mobile_log_d.te
@@ -27,8 +27,8 @@ init_daemon_domain(mobile_log_d)
# Operation : Migration
# Purpose : for L early bring-up
allow mobile_log_d kernel:system syslog_mod;
-allow mobile_log_d sdcard_internal:dir create_dir_perms;
-allow mobile_log_d sdcard_internal:file create_file_perms;
+allow mobile_log_d fuse:dir create_dir_perms;
+allow mobile_log_d fuse:file create_file_perms;
allow mobile_log_d platform_app:fd use;
allow mobile_log_d platform_app_tmpfs:file write;
#allow mobile_log_d unlabeled:lnk_file read;
diff --git a/sepolicy/netdiag.te b/sepolicy/netdiag.te
index f28bae8..0a4e770 100644
--- a/sepolicy/netdiag.te
+++ b/sepolicy/netdiag.te
@@ -30,8 +30,8 @@ init_daemon_domain(netdiag)
# Operation : Migration
# Purpose : for L early bring-up
allow netdiag shell_exec:file execute_no_trans;
-allow netdiag sdcard_internal:dir { write search read create open add_name };
-allow netdiag sdcard_internal:file { write create open getattr };
+allow netdiag fuse:dir { write search read create open add_name };
+allow netdiag fuse:file { write create open getattr };
allow netdiag self:packet_socket { write ioctl setopt read getopt create };
allow netdiag fuse:dir { remove_name write search read remove_name open add_name create};
allow netdiag fuse:file { rename write getattr read create open unlink};
diff --git a/sepolicy/nfc.te b/sepolicy/nfc.te
index 2507aab..d3282e7 100644
--- a/sepolicy/nfc.te
+++ b/sepolicy/nfc.te
@@ -42,10 +42,10 @@ allow nfc nfc_data_file:file { read getattr open rename write ioctl setattr crea
# Operation : Refine
# Purpose : Set NFC permission to access SD card for debug purpose.
-allow nfc sdcard_internal:dir { write remove_name search create add_name };
-allow nfc sdcard_internal:file { read write getattr open rename create };
-allow nfc sdcard_external:dir { write add_name search };
-allow nfc sdcard_external:file { read write getattr open create };
+allow nfc fuse:dir { write remove_name search create add_name };
+allow nfc fuse:file { read write getattr open rename create };
+allow nfc vfat:dir { write add_name search };
+allow nfc vfat:file { read write getattr open create };
# ==============================================
diff --git a/sepolicy/radio.te b/sepolicy/radio.te
index 6f76f2b..174b4f3 100644
--- a/sepolicy/radio.te
+++ b/sepolicy/radio.te
@@ -15,8 +15,8 @@ allow radio rild_mal_socket:sock_file write;
allow radio rild_mal_at_socket:sock_file write;
allow radio rild_mal_md2_socket:sock_file write;
allow radio rild_mal_at_md2_socket:sock_file write;
-allow radio sdcard_internal:dir { write create add_name };
-allow radio sdcard_internal:file { read write getattr open create };
+allow radio fuse:dir { write create add_name };
+allow radio fuse:file { read write getattr open create };
##violate never allow rule
#allow radio sysfs:file write;
##violate never allow rule
diff --git a/sepolicy/sn.te b/sepolicy/sn.te
index a71d491..4628a65 100644
--- a/sepolicy/sn.te
+++ b/sepolicy/sn.te
@@ -26,7 +26,7 @@ init_daemon_domain(sn)
# Date : WK14.31
# Operation : Migration
# Purpose : for L early bring up
-allow sn sdcard_internal:dir search;
+allow sn fuse:dir search;
allow sn fuse:file { read getattr open };
allow sn sysfs:file write;
#allow sn tmpfs:lnk_file read;