From 80531326ac20e83cc9d1e17899334844f903287d Mon Sep 17 00:00:00 2001 From: Ju-Yi Cheng Date: Sat, 18 Jan 2020 09:37:01 +0800 Subject: [PATCH] [ALPS03869840] P migration: Remove label aosp prop [Detail] Vendor partition shouldnt access aosp defined property which is not in whitlist. So remove the related changes of labeled aosp property. This reverts commit 9d534a80d67e7457a1411b8b36249898ed4c6986. This reverts commit 901fb42d2e3856a139b90420922f558d7231ea7d. This reverts commit 41dc8fb567b409e149e59f4f514268ca5883c7ab. [Solution] Remove label of ro.sf.lcd_density. MTK-Commit-Id: 02cf063b8407a9d9242f064c86767200e9c0ac0a Change-Id: I02dcc2fa3fda95c498f0ef70d9aa6bd9224d3b02 CR-Id: ALPS03869840 Feature: [Module]SurfaceFlinger/HWComposer --- non_plat/hal_graphics_composer_default.te | 2 -- non_plat/property.te | 1 - non_plat/property_contexts | 1 - non_plat/shell.te | 4 ---- non_plat/surfaceflinger.te | 5 ----- non_plat/untrusted_app_all.te | 7 ------- non_plat/zygote.te | 5 ----- 7 files changed, 25 deletions(-) delete mode 100644 non_plat/untrusted_app_all.te diff --git a/non_plat/hal_graphics_composer_default.te b/non_plat/hal_graphics_composer_default.te index 835e71d..2e304f5 100644 --- a/non_plat/hal_graphics_composer_default.te +++ b/non_plat/hal_graphics_composer_default.te @@ -42,7 +42,5 @@ binder_call(hal_graphics_composer_default, mtk_hal_power) # Date : WK17.32 # Operation : O Migration # Purpose: Allow to access property -set_prop(hal_graphics_composer_default, graphics_config_prop) -get_prop(hal_graphics_composer_default, graphics_config_prop) set_prop(hal_graphics_composer_default, graphics_hwc_pid_prop) get_prop(hal_graphics_composer_default, graphics_hwc_pid_prop) diff --git a/non_plat/property.te b/non_plat/property.te index 3d7f831..d181447 100644 --- a/non_plat/property.te +++ b/non_plat/property.te @@ -154,7 +154,6 @@ type mtk_telephony_sensitive_prop, property_type; type mtk_thermal_config_prop, property_type; #=============allow composer set property ============================ -type graphics_config_prop, property_type; type graphics_hwc_pid_prop, property_type; #============= mtkcam property ============================ diff --git a/non_plat/property_contexts b/non_plat/property_contexts index a459e68..1606381 100644 --- a/non_plat/property_contexts +++ b/non_plat/property_contexts @@ -161,7 +161,6 @@ ro.mtk_md_mims_support u:object_r:mtk_telephony_sensitive_prop:s0 thermal.manager.data u:object_r:mtk_thermal_config_prop:s0 #=============allow composer set property ============================ -ro.sf.lcd_density u:object_r:graphics_config_prop:s0 debug.sf.hwc_pid u:object_r:graphics_hwc_pid_prop:s0 #============= mtkcam property ============================ diff --git a/non_plat/shell.te b/non_plat/shell.te index c445e8c..eede6b6 100644 --- a/non_plat/shell.te +++ b/non_plat/shell.te @@ -6,10 +6,6 @@ # Purpose : allow shell to switch aee mode allow shell aee_aed:unix_stream_socket connectto; -# Date : WK17.34 -# Purpose : allow shell to get density property -get_prop(shell, graphics_config_prop) - # Date : WK17.35 # Purpose : allow shell to dump the debugging information of camera hal. allow shell hal_camera_hwservice:hwservice_manager { find }; diff --git a/non_plat/surfaceflinger.te b/non_plat/surfaceflinger.te index ab9592f..4b82c76 100644 --- a/non_plat/surfaceflinger.te +++ b/non_plat/surfaceflinger.te @@ -36,11 +36,6 @@ allow surfaceflinger debugfs_ion:dir search; # Purpose: Allow to access cmdq driver allow surfaceflinger mtk_cmdq_device:chr_file { read ioctl open }; -# Date : WK17.32 -# Operation : O Migration -# Purpose: Allow to access property -get_prop(surfaceflinger, graphics_config_prop) - # Date : W17.39 # Perform Binder IPC. binder_use(surfaceflinger) diff --git a/non_plat/untrusted_app_all.te b/non_plat/untrusted_app_all.te deleted file mode 100644 index f520d45..0000000 --- a/non_plat/untrusted_app_all.te +++ /dev/null @@ -1,7 +0,0 @@ -# ============================================== -# MTK Policy Rule -# ============================================== - -# Date : 2017/08/10 -# Purpose : Allow to access density property -get_prop(untrusted_app_all, graphics_config_prop) diff --git a/non_plat/zygote.te b/non_plat/zygote.te index 5147cde..416727b 100644 --- a/non_plat/zygote.te +++ b/non_plat/zygote.te @@ -10,8 +10,3 @@ allow zygote proc_ged:file {open read write ioctl getattr}; # Purpose: Allow to access gpu for memtrack functions allow zygote gpu_device:dir search; allow zygote gpu_device:chr_file { open read write ioctl getattr}; - -# Date : WK17.32 -# Operation : O Migration -# Purpose: Allow to access property -get_prop(zygote, graphics_config_prop)