diff --git a/rootdir/bin/init.qcom.usb.sh b/rootdir/bin/init.qcom.usb.sh index 31b5f41..7960911 100755 --- a/rootdir/bin/init.qcom.usb.sh +++ b/rootdir/bin/init.qcom.usb.sh @@ -239,18 +239,6 @@ if [ -d /config/usb_gadget/g1/functions/uvc.0 ]; then ln -s streaming/header/h streaming/class/ss/ fi -#ifdef VENDOR_EDIT -#Enable diag and adb for FTM -boot_mode=`getprop ro.boot.ftm_mode` -echo "boot_mode: $boot_mode" > /dev/kmsg -case "$boot_mode" in - "ftm_at" | "ftm_rf" | "ftm_wlan" | "ftm_mos") - setprop sys.usb.config diag,adb - setprop persist.sys.usb.config diag,adb - echo "AFTER boot_mode: diag,adb" > /dev/kmsg -esac -#endif - boot_mode=`getprop ro.vendor.factory_mode` if [ "$boot_mode" == "1" ]; then echo "boot_mode: factory_mode" > /dev/kmsg diff --git a/rootdir/etc/init.oem.rc b/rootdir/etc/init.oem.rc index 19c3e45..c45bf9b 100644 --- a/rootdir/etc/init.oem.rc +++ b/rootdir/etc/init.oem.rc @@ -34,13 +34,6 @@ service dashd /vendor/bin/dashd seclabel u:r:dashd:s0 group root system -#bsp, 2020/01/04 Add wireless charge -service wlchgd /vendor/bin/wlchgd - class main - disabled - seclabel u:r:wlchgd:s0 - group root system - on fs #yankelong add chown system system /sys/class/leds/vibrator/haptic_audio_ai_input @@ -109,8 +102,6 @@ on fs write /sys/devices/platform/soc/a94000.i2c/i2c-4/4-005d/tp_fw_update 0 write /sys/devices/platform/soc/880000.i2c/i2c-0/0-0038/tp_fw_update 0 write /sys/devices/platform/soc/880000.spi/spi_master/spi0/spi0.0/tp_fw_update 0 -#add for n200 - write /sys/devices/platform/soc/4a80000.spi/spi_master/spi0/spi0.0/tp_fw_update 0 #add for tp debug log & to set node gesture_enable chown system system /proc/touchpanel/tp_debug_log @@ -123,16 +114,6 @@ on fs chown system system /proc/touchpanel/touch_apk chown system system /proc/touchpanel/get_device_temperature chown system system /proc/touchpanel/get_ic_firmware_version -# /* add for wireless charge */ - chown system system /proc/wireless/enable_tx - chown system system /proc/wireless/enable_rx - chown system system /proc/wireless/epp_or_bpp - chown system system /proc/wireless/current_out - chown system system /proc/wireless/rx_voltage - chown system system /proc/wireless/charge_pump_en - chown system system /proc/wireless/deviated - chown system system /proc/wireless/quiet_mode - chown system system /proc/wireless/fast_skin_threld chown system system /proc/enhance_dash @@ -316,9 +297,6 @@ on init chown system system /dev/dash chmod 0664 /dev/dash #restorecon /dev/dash - chown system system /dev/wlchg - chmod 0664 /dev/wlchg - #restorecon /dev/wlchg on post-fs #ifdef VENDOR_EDIT @@ -390,11 +368,6 @@ on post-fs chown system system /sys/class/power_supply/bms/full_charge_capacity_filtered chmod 660 /sys/class/power_supply/bms/full_charge_capacity_filtered #endif -#ifdef VENDOR_EDIT -#randle.liu@optimization, 2020/04/24, [OSP-6116] avoid waking up when wireless charging disconnects - chown system system /sys/class/power_supply/wireless/icon_delay - chmod 660 /sys/class/power_supply/wireless/icon_delay -#endif #jay.fa@OPTI, 2020/08/12, add for [OPTI-42] hypnus chown root system /sys/class/thermal/cooling_device0/cur_state chown root system /sys/class/thermal/cooling_device1/cur_state @@ -413,20 +386,6 @@ on post-fs-data mkdir /data/vendor/oemnvitems 0771 radio radio #brandon.zeng@Conn,2020/08/11. move data path to post-fs-data mkdir /data/vendor/nfc 0770 nfc nfc - # Ted.Lin@ASTI 2019/06/12 add for CONFIG_HOUSTON - chown system system /sys/module/houston/parameters/fps_boost - chown system system /sys/module/houston/parameters/fps_data_sync - chown system system /sys/module/houston/parameters/perf_ready - chown system system /sys/module/houston/parameters/ais_enable - chown system system /sys/module/houston/parameters/sample_rate_ms - chown system system /sys/module/houston/parameters/ht_enable - chown system system /sys/module/houston/parameters/fps_boost_enable - chown system system /sys/module/houston/parameters/fps_boost_strategy - chown system system /sys/module/houston/parameters/tb_ctl - chown system system /sys/module/houston/parameters/tb_enable - chown system system /sys/module/houston/parameters/reset - chown system system /sys/module/houston/parameters/hwui_boost_enable - chown system system /sys/module/houston/parameters/fuse_boost chown system system /dev/ht_ctl chown system system /sys/module/pccore/parameters/params chown system system /sys/module/tpd/parameters/tpd_enable @@ -435,14 +394,6 @@ on post-fs-data chown system system /sys/module/tpd/parameters/tpd_dynamic chown system system /sys/module/fuse/parameters/shortcircuit chown system system /sys/module/fuse/parameters/sct_mode - # Jacky.Ho@OPTI 2020/09/23 add for [OSP-8617] - chown system system /sys/module/houston/parameters/game_fps_pid - chown system system /sys/module/houston/parameters/game_info - # fps stabilizer - chown system system /sys/module/houston/parameters/efps_max - chown system system /sys/module/houston/parameters/fps_boost_strategy - chown system system /sys/module/houston/parameters/egl_buf - chown system system /sys/module/houston/parameters/ht_online_config_update # rock.lin@OPTI [OPTI-191] for power consumption chown system system /sys/module/cpufreq_bouncing/parameters/enable @@ -452,10 +403,6 @@ on post-fs-data chown system system /sys/module/tpp/parameters/tpp_on chown system system /sys/module/tpp/parameters/strategy -# Ted.Lin@ASTI 2019/06/12 add for CONFIG_CONTROL_CENTER - chown system system /dev/cc_ctl - chown system system /proc/cc_ctl - #endif /* VENDOR_EDIT */ # rock.lin@OPTI 2020/06/11 add for CONFIG_RATP @@ -468,12 +415,6 @@ on post-fs-data restorecon /mnt/vendor/persist/hdcp #endif -# ifdef VENDOR_EDIT -# denzel.chen@performance, 2020/05/12, add for OPBRITN-3462 - chmod 664 /sys/module/memplus_core/parameters/memory_plus_wake_memex - chown system system /sys/module/memplus_core/parameters/memory_plus_wake_memex -# endif - # neil.sun@Connectivity, 2020/08/12, add for wifi minidump mkdir /data/vendor/ramdump/wifi 0770 system system @@ -482,9 +423,6 @@ on post-fs-data mkdir /data/vendor/ramdump/adsp 0770 system system # endif - # kimmy.yang@NETWORK, 20201223, add for SM8350 (SoC) - mkdir /data/vendor/ramdump/modem 0770 system system - #ifdef VENDOR_EDIT online ISP tuning mkdir /data/vendor/camera_update 0777 camera camera write /data/vendor/camera_update/reservetuningbin0 "" @@ -718,21 +656,6 @@ on property:gf.debug.dump_path=* #endif -# ken.lin@ASTI, 2019/6/21, add for memplus -service memplus_config /vendor/bin/sh /vendor/etc/vendor.memplus.sh - user root - disabled - oneshot - seclabel u:r:vendor_qti_init_shell:s0 - -on property:persist.vendor.memplus.enable=* - start memplus_config - -on property:persist.sys.memplus.swappiness=* - write /proc/sys/vm/swappiness ${persist.sys.memplus.swappiness} -on property:persist.sys.memplus.direct_swappiness=* - write /proc/sys/vm/direct_swappiness ${persist.sys.memplus.direct_swappiness} - #ifdef VENDOR_EDIT #brandon.zeng@Conn,2020/05/08. add for nfc pnscr tool service nfctransmitstart /vendor/bin/sh /vendor/bin/nfc_trasmit_start.sh @@ -819,13 +742,6 @@ on property:persist.sys.oem.otg_support=false write /sys/class/oplus_chg/usb/otg_switch 0 #endif -#ifdef VENDOR_EDIT -on property:persist.vendor.oem.wechat_cameraon=1 - write /sys/class/oplus_chg/common/camera_on 1 -on property:persist.vendor.oem.wechat_cameraon=0 - write /sys/class/oplus_chg/common/camera_on 0 -#endif - on property:vendor.sys.op.game=1 write /proc/sys/kernel/sched_skip_affinity 1 @@ -902,31 +818,3 @@ on property:sys.boot_completed=1 write /sys/devices/platform/soc/1d84000.ufshc/ufstw_lu0/tw_enable 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 - -#alden.zhang@OPTI, 2020/7/18. [OSP-8064], add for IOLIMIT -on property:persist.sys.iolimiter.enable=true - write /proc/iolimit_enable 1 - write /sys/module/oneplus_healthinfo/parameters/ohm_action_ctrl Y - chown system system /sys/module/oneplus_healthinfo - chown system system /sys/module/oneplus_healthinfo/parameters - chown system system /sys/module/oneplus_healthinfo/parameters/ohm_iowait_h_ms - chown system system /sys/module/oneplus_healthinfo/parameters/ohm_iowait_l_ms - chown system system /sys/module/oneplus_healthinfo/parameters/ohm_read_thresh - chown system system /sys/module/oneplus_healthinfo/parameters/ohm_write_thresh - chown system system /sys/module/oneplus_healthinfo/parameters/ohm_sample_time - chown system system /sys/module/oneplus_healthinfo/parameters/ohm_action_ctrl - chown system system /proc/iolimit_enable - -#huangwen.chen#OPTI, 2020/9/16, [OPTI-43], add for zram writeback -on property:persist.vendor.oem.dump=0 - setprop persist.vendor.zwriteback.backup 0 - -on property:persist.vendor.oem.dump=1 - setprop persist.vendor.zwriteback.backup 1 - -#ifdef ODM_WT_EDIT Kai.Cao@ODM_WT.NW.SIM,BILLIE8-6704, 2020/07/13,Support single and dual card solutions -on property:ro.boot.rf_version=0 && property:ro.boot.project_codename=billie8 - setprop persist.radio.multisim.config "ssss" -on property:ro.boot.rf_version=0 && property:ro.boot.project_codename=billie8t - setprop persist.radio.multisim.config "ssss" -#endif diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 033b436..d73676f 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -239,10 +239,6 @@ on boot # limit discard size to 128MB in order to avoid long IO latency write /sys/block/sda/queue/discard_max_bytes 134217728 - # bin.zhong@ASTI, 2019/08/06, Add for OMM - chmod 0750 /dev/memcg - chown system system /dev/memplus - # allen.lv@ASTI, 2019/10/12, Add for Virtual Memory Defragment chmod 0660 /dev/fragment_monitor chown system system /dev/fragment_monitor diff --git a/rootdir/etc/init.qcom.usb.rc b/rootdir/etc/init.qcom.usb.rc index be7d9a3..1af83ea 100644 --- a/rootdir/etc/init.qcom.usb.rc +++ b/rootdir/etc/init.qcom.usb.rc @@ -94,15 +94,6 @@ on charger && property:ro.boot.type=auto symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1 write /config/usb_gadget/g1/UDC ${sys.usb.controller} -on init && property:ro.boot.project_name=19811 - setprop vendor.wireless_charge.enable true - -on boot && property:vendor.wireless_charge.enable=true - start wlchgd - -on charger && property:vendor.wireless_charge.enable=true - start wlchgd - on init && property:ro.build.type=userdebug exec u:r:vendor-qti-testscripts:s0 -- /vendor/bin/sh /vendor/bin/init.qti.usb.debug.sh diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index 34ce0dd..f0506ed 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -15,7 +15,6 @@ type sysfs_display_mode, fs_type, sysfs_type; type sysfs_fod, fs_type, sysfs_type; type sysfs_fsc, fs_type, sysfs_type; type sysfs_fuse, fs_type, sysfs_type; -type sysfs_memplus, fs_type, sysfs_type; type sysfs_project_info, fs_type, sysfs_type; type sysfs_tpd, fs_type, sysfs_type; type sysfs_tri_state_key, sysfs_type, fs_type; diff --git a/sepolicy/vendor/genfs_contexts b/sepolicy/vendor/genfs_contexts index 9692b2b..34d43e6 100644 --- a/sepolicy/vendor/genfs_contexts +++ b/sepolicy/vendor/genfs_contexts @@ -23,7 +23,6 @@ genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/auth_status u:object_r:sysfs_fod:s0 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/cancel_status u:object_r:sysfs_fod:s0 genfscon sysfs /devices/platform/soc/soc:tri_state_key/hall_data_calib u:object_r:sysfs_tri_state_key:s0 -genfscon sysfs /module/memplus_core/parameters u:object_r:sysfs_memplus:s0 genfscon sysfs /module/qpnp_smb5/parameters/call_on u:object_r:sysfs_dash_charger:s0 genfscon sysfs /module/qpnp_smb5/parameters/video_call_on u:object_r:vendor_sysfs_video_call_on:s0 genfscon sysfs /module/stmvl53l1 u:object_r:sysfs_vl53l1:s0 diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te index 24ee309..5b92105 100644 --- a/sepolicy/vendor/property.te +++ b/sepolicy/vendor/property.te @@ -2,7 +2,6 @@ vendor_internal_prop(vendor_cwb_prop) vendor_internal_prop(vendor_db_security_prop) vendor_public_prop(vendor_fingerprint_prop) vendor_internal_prop(vendor_gps_prop) -vendor_internal_prop(vendor_memplus_prop) vendor_internal_prop(vendor_nfc_prop) vendor_internal_prop(vendor_oem_bluetooth_prop) vendor_internal_prop(vendor_oem_wifi_prop) diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts index cc1f467..b58e925 100644 --- a/sepolicy/vendor/property_contexts +++ b/sepolicy/vendor/property_contexts @@ -34,7 +34,6 @@ vendor.oem.rbr.log.clean u:object_r:vendor_default_prop:s0 vendor.oem.wifi.socket.quit u:object_r:vendor_set_wlan_prop:s0 vendor.service.wifi.socket.enable u:object_r:vendor_oem_wifi_prop:s0 vendor.service.wifi.socket.mdm.enable u:object_r:vendor_oem_wifi_prop:s0 -vendor.sys.memplus.postboot u:object_r:vendor_memplus_prop:s0 vendor.wlan.driver.status u:object_r:vendor_set_wlan_prop:s0 vendor.wlan.ftm.daemon u:object_r:vendor_set_wlan_prop:s0 vendor.wlan.ftm.up u:object_r:vendor_set_wlan_prop:s0 diff --git a/sepolicy/vendor/vendor_qti_init_shell.te b/sepolicy/vendor/vendor_qti_init_shell.te index 68725fb..5225e0f 100644 --- a/sepolicy/vendor/vendor_qti_init_shell.te +++ b/sepolicy/vendor/vendor_qti_init_shell.te @@ -5,8 +5,6 @@ allow vendor_qti_init_shell sysfs:file write; allow vendor_qti_init_shell sysfs_fsc:dir r_dir_perms; allow vendor_qti_init_shell sysfs_fsc:file rw_file_perms; -allow vendor_qti_init_shell sysfs_memplus:file rw_file_perms; - allow vendor_qti_init_shell vendor_data_file:dir create_dir_perms; allow vendor_qti_init_shell vendor_data_file:file create_file_perms; @@ -22,5 +20,4 @@ allow vendor_qti_init_shell vendor_wcnss_service_exec:file execute_no_trans; get_prop(vendor_qti_init_shell, exported_system_prop) set_prop(vendor_qti_init_shell, ctl_default_prop) -set_prop(vendor_qti_init_shell, vendor_memplus_prop) set_prop(vendor_qti_init_shell, vendor_set_wlan_prop)