From 561fad2a701987da2648ddf80239a8d31dbed247 Mon Sep 17 00:00:00 2001 From: Allen Chu Date: Sat, 18 Jan 2020 10:00:38 +0800 Subject: [PATCH] [ALPS03804621] [P migration] Remove old property label We never use persist.ril.* at Android P. So, remove it. MTK-Commit-Id: 6a1943658ce7647e6efd65234252d69e83be1a47 Change-Id: I49d35e81192dfd9707687400bc3f0885cde16940 CR-Id: ALPS03804621 Feature: DSDS (Dual SIM Dual Standby) Framework-Common Framework(RIL) --- non_plat/mtkfusionrild.te | 3 +-- non_plat/mtkrild.te | 1 - non_plat/property.te | 1 - non_plat/property_contexts | 1 - non_plat/radio.te | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/non_plat/mtkfusionrild.te b/non_plat/mtkfusionrild.te index cf5a31d..20bde09 100644 --- a/non_plat/mtkfusionrild.te +++ b/non_plat/mtkfusionrild.te @@ -25,7 +25,6 @@ allow rild cgroup:dir create_dir_perms; #set_prop(rild, radio_prop) #set_prop(rild, net_radio_prop) #set_prop(rild, system_radio_prop) -set_prop(rild, persist_ril_prop) auditallow rild net_radio_prop:property_service set; auditallow rild system_radio_prop:property_service set; set_prop(rild, ril_active_md_prop) @@ -147,4 +146,4 @@ set_prop(rild, vendor_radio_prop) #Date : W18.21 #Purpose: allow rild access to vendor.ril.ipo system property -set_prop(rild, vendor_ril_ipo_prop) \ No newline at end of file +set_prop(rild, vendor_ril_ipo_prop) diff --git a/non_plat/mtkrild.te b/non_plat/mtkrild.te index 8a8f49c..559500a 100644 --- a/non_plat/mtkrild.te +++ b/non_plat/mtkrild.te @@ -28,7 +28,6 @@ allow mtkrild cgroup:dir create_dir_perms; #set_prop(mtkrild, radio_prop) #set_prop(mtkrild, net_radio_prop) #set_prop(mtkrild, system_radio_prop) -set_prop(mtkrild, persist_ril_prop) auditallow mtkrild net_radio_prop:property_service set; auditallow mtkrild system_radio_prop:property_service set; set_prop(mtkrild, ril_active_md_prop) diff --git a/non_plat/property.te b/non_plat/property.te index 0cb380a..61ee61a 100644 --- a/non_plat/property.te +++ b/non_plat/property.te @@ -26,7 +26,6 @@ type ctl_dualmdlogger_prop, property_type; #=============allow viarild to start property============== type ctl_viarild_prop, property_type; #=============allow mtkrild to set persist.ril property============== -type persist_ril_prop, property_type, mtk_core_property_type; type vendor_ril_ipo_prop, property_type, mtk_core_property_type; #=============allow gsm0710muxd to set mux property============== diff --git a/non_plat/property_contexts b/non_plat/property_contexts index d92e1e2..a31d19f 100644 --- a/non_plat/property_contexts +++ b/non_plat/property_contexts @@ -14,7 +14,6 @@ ctl.emdlogger3 u:object_r:ctl_emdlogger3_prop:s0 ctl.dualmdlogger u:object_r:ctl_dualmdlogger_prop:s0 #=============allow mtkrild to set persist.ril property============== -persist.ril u:object_r:persist_ril_prop:s0 vendor.ril.ipo u:object_r:vendor_ril_ipo_prop:s0 #=============allow netlog============== diff --git a/non_plat/radio.te b/non_plat/radio.te index e572a16..d8a44ce 100644 --- a/non_plat/radio.te +++ b/non_plat/radio.te @@ -43,7 +43,6 @@ allow radio mtgpio_device:chr_file { read ioctl open }; allow radio stpbt_device:chr_file { read write open }; allow radio stpant_device:chr_file { read write open }; allow radio bt_int_adp_socket:sock_file write; -allow radio persist_ril_prop:property_service set; allow radio mt6605_device:chr_file { read write ioctl open getattr }; allow radio nfc_socket:dir { write add_name remove_name search }; allow radio system_prop:property_service set;