diff --git a/rootdir/etc/init.oem.rc b/rootdir/etc/init.oem.rc index 581a215..0f30866 100644 --- a/rootdir/etc/init.oem.rc +++ b/rootdir/etc/init.oem.rc @@ -42,7 +42,6 @@ service wlchgd /vendor/bin/wlchgd group root system on fs - mount ext4 /dev/block/bootdevice/by-name/op1 /mnt/vendor/op1 ro barrier=1 discard context=u:object_r:op1_file:s0 #yankelong add chown system system /sys/class/leds/vibrator/haptic_audio_ai_input chown system system /sys/class/leds/vibrator/haptic_audio_tp_input @@ -712,32 +711,6 @@ on property:vendor.wlan.ftm.daemon=off on property:vendor.wlan.write.con_mode=* write /sys/module/wlan/parameters/con_mode ${vendor.wlan.write.con_mode} -#ifdef VENDOR_EDIT -#binson.xu@oneplus.com, 2019/02/17, add for write alikey -service mvalikey /system/bin/cp -rp /sdcard/.lii /mnt/vendor/op2/ - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service rmalikey /system/bin/rm -r /mnt/vendor/op2/.lii - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service chownalikey /system/bin/chown -R system.system /mnt/vendor/op2/.lii - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - #len.nie@bsp, 2020/11/04. add for dump fingerprint data on property:gf.debug.dump_path=* mkdir /sdcard/Android/data/gf_file 0755 system ext_data_rw @@ -907,83 +880,6 @@ service stopiwprivcontention /vendor/bin/sh /vendor/bin/startcontention.sh 0 #endif -#ifdef VENDOR_EDIT -# TomCheng@Core ,2020/06/22, HDCP provision key feature -service mvhdcpkey /system/bin/mv /sdcard/hdcpkey /mnt/vendor/op2/hdcpkey - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service rmhdcpkey /system/bin/rm /mnt/vendor/op2/hdcpkey - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service chmodhdcpkey /system/bin/chmod 777 /mnt/vendor/op2/hdcpkey - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service dphdcp2p2prov /vendor/bin/hdcp2p2prov /mnt/vendor/op2/dphdcp2key /mnt/vendor/op2/DPS_hdcp2 - class core - setenv LD_LIBRARY_PATH /vendor/lib64 - user root - group root - disabled - oneshot - seclabel u:r:vendor_init:s0 - -service verifydphdcp2p2prov /vendor/bin/hdcp2p2prov -verify - class core - setenv LD_LIBRARY_PATH /vendor/lib64 - user root - group root - disabled - oneshot - seclabel u:r:vendor_init:s0 - -service mvdphdcp2key /system/bin/mv /sdcard/dphdcp2key /mnt/vendor/op2/dphdcp2key - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service rmdphdcp2key /system/bin/rm /mnt/vendor/op2/dphdcp2key - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service mvdpshdcp2 /system/bin/mv /sdcard/DPS_hdcp2 /mnt/vendor/op2/DPS_hdcp2 - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service rmdpshdcp2 /system/bin/rm /mnt/vendor/op2/DPS_hdcp2 - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 -#endif - on property:vendor.sys.op.disable_ufstw=1 write /sys/devices/platform/soc/1d84000.ufshc/ufstw_lu0/tw_enable 0 @@ -1006,163 +902,6 @@ on property:sys.boot_completed=1 write /sys/devices/platform/soc/1d84000.ufshc/ufstw_lu0/flush_enable 1 write /sys/devices/platform/soc/1d84000.ufshc/ufstw_lu0/flush_during_hibern_enter 1 -# ifdef VENDOR_EDIT -# narci.gu@SYSTEM, 2018/7/23, [AN-709] Add for keymaster key -service KmInstallKeybox19805 /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlus8T_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -service KmInstallKeybox20809 /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlus8TTMO_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# ifdef VENDOR_EDIT -# yanamadala.ragini@SYSTEM, 2018/7/23, [AVICII-2558] Add for keymaster key -service KmInstallKeybox20801 /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml Nord_Key_Attest_00 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# yanamadala.ragini@SYSTEM, 2020/11/30, [AN-977] Add for keymaster key -service KmInstallKeybox20828 /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlus9R_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 -# endif - -# v-huanouyang@SYSTEM, 2020/10/22 [TFS-20170] Update Google key box for check on Lemonadev -service KmInstallKeyboxLemonadev /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlus9VZW_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# v-huanouyang@SYSTEM, 2020/10/22 [TFS-20170] Update Google key box for check on Lemonadet -service KmInstallKeyboxLemonadet /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlus9TMO_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# v-huanouyang@SYSTEM, 2020/10/22 [TFS-20170] Update Google key box for check on Lemonade -service KmInstallKeyboxLemonade /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlus9_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# v-huanouyang@SYSTEM, 2020/10/22 [TFS-20170] Update Google key box for check on Lemonadep -service KmInstallKeyboxLemonadep /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlus9Pro_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# v-huanouyang@SYSTEM, 2020/10/22 [TFS-20170] Update Google key box for check on Lemonadept -service KmInstallKeyboxLemonadept /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlus9ProTMO_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# braden.liu@SYSTEM, 2021/01/05 Update Google key box for check on Dre -service KmInstallKeyboxDre8t /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlusN200TMO_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# braden.liu@SYSTEM, 2021/01/05 Update Google key box for check on Dre -service KmInstallKeyboxDre8m /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlusN200METRO_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# braden.liu@SYSTEM, 2021/01/05 Update Google key box for check on Dre -service KmInstallKeyboxDre9 /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlusN200_Key_Attest_0 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -# dongbin@WT_ODM_SYSTEM, 2021/01/27 Update Google key box for check on ebba -service KmInstallKeybox20813 /vendor/bin/KmInstallKeybox /mnt/vendor/op2/.lii/keyboxes_ciphered.xml OnePlusNordCE_Key_Attest_00 true - class core - setenv LD_LIBRARY_PATH /vendor/lib64/hw - user system - group root - disabled - oneshot - seclabel u:r:keybox_oem:s0 - -service keyboxxml /system/bin/mv /sdcard/.lii /mnt/vendor/op2/ - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service rmkeyboxxml /system/bin/rm -rf /mnt/vendor/op2/.lii - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 - -service chmodkeyboxxmldir /system/bin/chmod 777 -R /mnt/vendor/op2/.lii - class core - user root - group root - disabled - oneshot - seclabel u:r:vold:s0 -# endif - #alden.zhang@OPTI, 2020/7/18. [OSP-8064], add for IOLIMIT on property:persist.sys.iolimiter.enable=true write /proc/iolimit_enable 1 diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index 280b352..a46e049 100644 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -53,29 +53,17 @@ on early-fs on fs start hwservicemanager - #RuiLi@ODM_WT.ENGINEERINGMODE, 2021/01/27 *#911# can't creat file in op2 - mkdir /mnt/vendor/op2 0660 system system mount_all --early -# ajinath@SYSTEM, 2020/01/16, [OSP-2080] Recovery boot reason - wait /mnt/vendor/op2 - chown system system /mnt/vendor/op2 - mkdir /mnt/vendor/op2/rbr_log 0770 system system -#endif /* VENDOR_EDIT */ chown root system /mnt/vendor/persist chmod 0771 /mnt/vendor/persist restorecon_recursive /mnt/vendor/persist mkdir /mnt/vendor/persist/data 0700 system system - #RuiLi@ODM_WT.ENGINEERINGMODE, 2021/01/27 *#911# can't creat file in op2 - wait /mnt/vendor/op2 - chown system system /mnt/vendor/op2 #sam.li@SYSTEM,add for cota mkdir /mnt/vendor/my_cota 0660 system system on post-fs # set RLIMIT_MEMLOCK to 64MB setrlimit 8 67108864 67108864 -# yanbin.zhang@ODM_WT.AD.Aging 2020/12/21, add for engineeringmode app. - mkdir /mnt/vendor/op2/recovery 0770 root system on late-fs wait_for_prop hwservicemanager.ready true diff --git a/sepolicy/vendor/device.te b/sepolicy/vendor/device.te index 17040bd..9133195 100644 --- a/sepolicy/vendor/device.te +++ b/sepolicy/vendor/device.te @@ -2,8 +2,6 @@ type byte_cntr_device, dev_type; type dash_device, dev_type; type fingerprintd_device, dev_type; type fragment_monitor_device, dev_type; -type op1_block_device, dev_type; -type op2_block_device, dev_type; type param_block_device, dev_type; type param_device, dev_type; type reserve1_block_device, dev_type; diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index 822555a..acc3998 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -1,7 +1,5 @@ # files type oem_file, file_type; -type op1_file, file_type; -type op2_file, file_type; type opf_file, file_type; # procfs diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index debeeba..0b36ec7 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -17,8 +17,6 @@ /dev/block/platform/soc/1d84000.ufshc/by-name/oem_cust2_[ab] u:object_r:vendor_custom_ab_block_device:s0 /dev/block/platform/soc/1d84000.ufshc/by-name/oem_dycnvbk u:object_r:vendor_modem_efs_partition_device:s0 /dev/block/platform/soc/1d84000.ufshc/by-name/oem_stanvbk u:object_r:vendor_modem_efs_partition_device:s0 -/dev/block/platform/soc/1d84000.ufshc/by-name/op1 u:object_r:op1_block_device:s0 -/dev/block/platform/soc/1d84000.ufshc/by-name/op2 u:object_r:op2_block_device:s0 /dev/block/platform/soc/1d84000.ufshc/by-name/opproduct_[ab] u:object_r:vendor_custom_ab_block_device:s0 /dev/block/platform/soc/1d84000.ufshc/by-name/param u:object_r:param_block_device:s0 /dev/block/platform/soc/1d84000.ufshc/by-name/reserve1 u:object_r:reserve1_block_device:s0 @@ -59,10 +57,6 @@ /(vendor|system/vendor)/bin/hw/vendor\.pixelworks\.hardware\.feature\.irisfeature-service u:object_r:hal_graphics_composer_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.oneplus u:object_r:hal_vibrator_default_exec:s0 -# OP1, OP2 files -/mnt/vendor/op1(/.*)? u:object_r:op1_file:s0 -/mnt/vendor/op2(/.*)? u:object_r:op2_file:s0 - # Persist files /mnt/vendor/persist u:object_r:vendor_data_file:s0 /mnt/vendor/persist/camera(/.*)? u:object_r:oem_file:s0 diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te index 5a1d5d8..d1880a2 100644 --- a/sepolicy/vendor/vendor_init.te +++ b/sepolicy/vendor/vendor_init.te @@ -1,8 +1,6 @@ allow vendor_init tmpfs:chr_file { read open }; allow vendor_init tmpfs:dir { create_dir_perms mounton }; -allow vendor_init op2_file:file create_file_perms; - allow vendor_init proc_direct_swappiness:file w_file_perms; allow vendor_init proc_hung_task:file w_file_perms; allow vendor_init proc_swappiness:file w_file_perms;