summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hu <alan.hu@mediatek.com>2020-10-28 14:43:11 +0800
committerGreg Kaiser <gkaiser@google.com>2020-11-30 09:51:26 -0800
commita020c7f7fe9a2888c774047a295d519f29c12eb2 (patch)
tree772d6e3ddacc08c84ce80da1a63449f5658f6063
parentaa399fdf30967f10aa943084ee3e0167e471ea05 (diff)
downloadwembley-sepolicy-a020c7f7fe9a2888c774047a295d519f29c12eb2.tar.gz
Remove unsupported setting.
Test: [Google] Clean build, wiping flash, and basic usage Change-Id: I1d0d35107c4c558c217a1e7e80cb7b86054a6a34
-rw-r--r--neverallows/plat_public/neverallows.te4
-rw-r--r--plat_private/emdlogger.te4
-rw-r--r--plat_private/property_contexts7
3 files changed, 6 insertions, 9 deletions
diff --git a/neverallows/plat_public/neverallows.te b/neverallows/plat_public/neverallows.te
index 3a5426a..a033c6f 100644
--- a/neverallows/plat_public/neverallows.te
+++ b/neverallows/plat_public/neverallows.te
@@ -291,10 +291,6 @@ full_treble_only(`
neverallow vold system_data_file:dir ~{ create rw_dir_perms mounton setattr rmdir };
-
-# GOOGLE commented out. Blocks desired policy change in AOSP. See b/141677108.
-# neverallow vold_prepare_subdirs system_data_file:dir ~{ open read write add_name remove_name rmdir relabelfrom search getattr };
-
with_asan(`
neverallow asan_extract system_data_file:dir ~{ create_dir_perms relabelfrom };
')
diff --git a/plat_private/emdlogger.te b/plat_private/emdlogger.te
index 31736d9..35200b9 100644
--- a/plat_private/emdlogger.te
+++ b/plat_private/emdlogger.te
@@ -76,9 +76,9 @@ set_prop(emdlogger, system_mtk_mdl_start_prop)
set_prop(emdlogger, system_mtk_debug_mdlogger_prop)
set_prop(emdlogger, system_mtk_persist_mdlog_prop)
set_prop(emdlogger, system_mtk_mdl_pulllog_prop)
-set_prop(emdlogger, usb_control_prop)
-set_prop(emdlogger, debug_prop)
set_prop(emdlogger, usb_prop)
+set_prop(emdlogger, debug_prop)
+set_prop(emdlogger, usb_control_prop)
## Android Q migration
## purpose: read modem db and filter folder and file
diff --git a/plat_private/property_contexts b/plat_private/property_contexts
index 43aa344..cd58add 100644
--- a/plat_private/property_contexts
+++ b/plat_private/property_contexts
@@ -9,15 +9,16 @@ ro.audio.usb.period_us u:object_r:exported_default_prop:s0 exact int
persist.adb.nonblocking_ffs u:object_r:exported_default_prop:s0 exact int
#============system fingerprint property===========
-# GOOGLE: commented out in favor of aosp/1484898
-#ro.system.build.fingerprint u:object_r:fingerprint_prop:s0 exact string
+# exported_fingerprint_prop is removed in Android S
+#ro.system.build.fingerprint u:object_r:exported_fingerprint_prop:s0 exact string
vendor.MB.logpost u:object_r:system_mtk_mobile_log_post_prop:s0
vendor.MB.logpost. u:object_r:system_mtk_mobile_log_post_prop:s0
persist.vendor.MB.logpost u:object_r:system_mtk_mobile_log_post_prop:s0
#=============allow vendor-init/system process access ro.telephony property==============
-ro.telephony.sim.count u:object_r:telephony_config_prop:s0 exact int
+# exported3_default_prop is removed in Android S
+#ro.telephony.sim.count u:object_r:exported3_default_prop:s0 exact int
#=============allow netlog==============
vendor.mtklog u:object_r:system_mtk_debug_mtklog_prop:s0