[ALPS03973363] move to system image
Move connsyslog to system image as
limitation to access phone storage in
andriod new version.
Change-Id: I68a37f21635b0ffeaddcda6ab5f59f8202c86709
CR-Id: ALPS03973363
Feature: Connsys Log Tool
diff --git a/non_plat/connsyslogger.te b/non_plat/connsyslogger.te
index d5cd571..179764d 100755
--- a/non_plat/connsyslogger.te
+++ b/non_plat/connsyslogger.te
@@ -1,12 +1,12 @@
-# Policy File of /vendor/bin/connsyslogger Executable File
+# Policy File of /system/bin/connsyslogger Executable File
# ==============================================
# Type Declaration
# ==============================================
type connsyslogger,domain;
-type connsyslogger_exec, exec_type, file_type, vendor_file_type;
-typeattribute connsyslogger mlstrustedsubject;
+type connsyslogger_exec, exec_type, file_type;
+typeattribute connsyslogger coredomain;
# Purpose : for create hidl server
hal_server_domain(connsyslogger, mtk_hal_log)
# ==============================================
@@ -14,17 +14,6 @@
# ==============================================
init_daemon_domain(connsyslogger)
-
-#allow connsyslogger to set property
-allow connsyslogger vendor_connsysfw_prop:property_service set;
-#allow connsyslogger debug_prop:property_service set;
-#allow connsyslogger persist_mtklog_prop:property_service set;
-#allow connsyslogger system_radio_prop:property_service set;
-
-#stpwmt device for connsyslogger
-allow connsyslogger stpwmt_device:chr_file { rw_file_perms };
-
-
#for logging sdcard access
allow connsyslogger fuse:dir { create_dir_perms };
allow connsyslogger fuse:file { create_file_perms };
@@ -33,17 +22,11 @@
allow connsyslogger consyslog_data_file:dir { create_dir_perms relabelto };
allow connsyslogger consyslog_data_file:fifo_file { create_file_perms };
allow connsyslogger consyslog_data_file:file { create_file_perms };
-#allow connsyslogger system_data_file:dir { create_dir_perms relabelfrom};
-
-#file_type_auto_trans(connsyslogger, system_data_file, consyslog_data_file)
+allow connsyslogger system_data_file:dir { create_dir_perms relabelfrom};
#consys logger socket access
allow connsyslogger property_socket:sock_file write;
allow connsyslogger init:unix_stream_socket connectto;
-#allow connsyslogger platform_app:unix_stream_socket connectto;
-#allow connsyslogger shell_exec:file { rx_file_perms };
-#allow connsyslogger system_file:file execute_no_trans;
-#allow connsyslogger zygote_exec:file { rx_file_perms };
allow connsyslogger tmpfs:lnk_file { create_file_perms };
@@ -59,7 +42,7 @@
allow connsyslogger mnt_user_file:lnk_file read;
allow connsyslogger storage_file:lnk_file read;
#allow connsyslogger self:capability { chown dac_override };
-allow connsyslogger proc:file {setattr write read open};
+#allow connsyslogger proc:file {setattr write read open};
#permission for use SELinux API
allow connsyslogger rootfs:file r_file_perms;
@@ -80,5 +63,9 @@
allow connsyslogger sdcardfs:file { create_file_perms };
allow connsyslogger rootfs:lnk_file getattr;
-#allow connsyslogger media_rw_data_file:file { create_file_perms };
-#allow connsyslogger media_rw_data_file:dir { create_dir_perms };
+allow connsyslogger media_rw_data_file:file { create_file_perms };
+allow connsyslogger media_rw_data_file:dir { create_dir_perms };
+
+set_prop(connsyslogger, vendor_connsysfw_prop)
+
+
diff --git a/non_plat/file.te b/non_plat/file.te
index 19d0999..d0e39f5 100644
--- a/non_plat/file.te
+++ b/non_plat/file.te
@@ -254,7 +254,7 @@
type sysfs_boot_type, fs_type, sysfs_type;
# consys Log folder
-type consyslog_data_file, file_type, data_file_type;
+type consyslog_data_file, file_type, data_file_type, core_data_file_type;
# Date : WK1817
# Purpose : for meta to get com port type and uart port info
diff --git a/non_plat/file_contexts b/non_plat/file_contexts
index d9cbe46..a564935 100644
--- a/non_plat/file_contexts
+++ b/non_plat/file_contexts
@@ -60,7 +60,7 @@
/data/vendor/audiohal(/.*)? u:object_r:mtk_audiohal_data_file:s0
/data/vendor/powerhal(/.*)? u:object_r:mtk_powerhal_data_file:s0
#/data/vendor/nfc(/.*)? u:object_r:nfc_data_file:s0
-/data/vendor/connsyslog(/.*)? u:object_r:consyslog_data_file:s0
+/data/connsyslog(/.*)? u:object_r:consyslog_data_file:s0
/data/vendor/stp_dump(/.*)? u:object_r:stp_dump_data_file:s0
/data/vendor/mediadrm(/.*)? u:object_r:mediadrm_vendor_data_file:s0
@@ -552,7 +552,7 @@
/(system\/vendor|vendor)/bin/factory u:object_r:factory_exec:s0
/(system\/vendor|vendor)/bin/mnld u:object_r:mnld_exec:s0
-/(system\/vendor|vendor)/bin/connsyslogger u:object_r:connsyslogger_exec:s0
+/system/bin/connsyslogger u:object_r:connsyslogger_exec:s0
/(system\/vendor|vendor)/bin/sysenv_daemon u:object_r:sysenv_daemon_exec:s0
/(system\/vendor|vendor)/bin/biosensord_nvram u:object_r:biosensord_nvram_exec:s0
diff --git a/non_plat/platform_app.te b/non_plat/platform_app.te
index 6e9558f..16dcbb6 100644
--- a/non_plat/platform_app.te
+++ b/non_plat/platform_app.te
@@ -25,6 +25,7 @@
allow platform_app mdlogger:unix_stream_socket connectto;
allow platform_app emdlogger:unix_stream_socket connectto;
allow platform_app cmddumper:unix_stream_socket connectto;
+allow platform_app connsyslogger:unix_stream_socket connectto;
unix_socket_connect(platform_app, netdiag, netdiag)
# Date: 2018/11/17
# purpose: allow MTKLogger to control Bluetooth HCI log via socket
@@ -105,3 +106,6 @@
# Package: com.mediatek.mtklogger
allow platform_app debug_mdlogger_prop:file { read getattr open };
allow platform_app debug_mtklog_prop:file { read getattr open };
+
+get_prop(platform_app, vendor_connsysfw_prop)
+
diff --git a/non_plat/property.te b/non_plat/property.te
index 0cb380a..7555f06 100644
--- a/non_plat/property.te
+++ b/non_plat/property.te
@@ -163,7 +163,7 @@
type atm_ipaddr_prop, property_type;
#=============allow consyslogger==============
-type vendor_connsysfw_prop, property_type, mtk_core_property_type;
+type vendor_connsysfw_prop, property_type, extended_core_property_type;
#=============radio group property=============
type vendor_radio_prop, property_type, mtk_core_property_type;
