From 96a7212b84e26a796dc23679362082e57a5f6f5a Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Fri, 21 Jan 2022 23:32:10 +0800 Subject: [PATCH] sm6375-common: Remove moto charger * The close-sourced binary uses symbols removed on R. It doesn't make much sense to fix the 45MB binary :), simply use AOSP one instead. * Move charge-only services to init.mmi.charge_only.rc while at it. Change-Id: I62cdd36603afb46d5287dfcaac3d16acc9fca178 --- common.mk | 3 - proprietary-files.txt | 1 - rootdir/etc/init/hw/init.mmi.charge_only.rc | 20 +++-- rootdir/etc/init/hw/init.mmi.rc | 24 ------ sepolicy/vendor/charge_only.te | 94 --------------------- sepolicy/vendor/file.te | 4 - sepolicy/vendor/file_contexts | 5 -- 7 files changed, 12 insertions(+), 139 deletions(-) delete mode 100644 sepolicy/vendor/charge_only.te diff --git a/common.mk b/common.mk index 3562542..365c8ac 100644 --- a/common.mk +++ b/common.mk @@ -112,9 +112,6 @@ PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.4-impl \ android.hardware.camera.provider@2.4-service_64 -# Charger -WITH_LINEAGE_CHARGER := false - # Device ID attestation PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml diff --git a/proprietary-files.txt b/proprietary-files.txt index 2f4b507..a34f28b 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -121,7 +121,6 @@ vendor/lib64/libcdsprpc.so vendor/lib64/libmdsprpc.so # Charger -vendor/bin/charge_only_mode vendor/bin/hvdcp_opti vendor/bin/init.qti.chg_policy.sh vendor/etc/charger_fstab.qti diff --git a/rootdir/etc/init/hw/init.mmi.charge_only.rc b/rootdir/etc/init/hw/init.mmi.charge_only.rc index e584f71..ed65ab1 100644 --- a/rootdir/etc/init/hw/init.mmi.charge_only.rc +++ b/rootdir/etc/init/hw/init.mmi.charge_only.rc @@ -1,12 +1,6 @@ -# Wait for the USB init shell script to finish, to prevent enumeration issues -on property:init.svc.vendor.mmi-usb-sh=stopped && property:ro.boot.mode=charger - setprop sys.usb.configfs 1 - setprop sys.usb.config charging - -on moto-charger +on charger stop vendor.sensors - trigger firmware_mounts_complete - start vendor.charge_only_mode + start vendor.thermal-com start system_suspend @@ -23,3 +17,13 @@ on moto-charger write /proc/sys/kernel/sched_boost 0 write /sys/module/lpm_levels/parameters/sleep_disabled 0 + +service vendor.thermal-com /vendor/bin/thermal-engine --minimode + class charger + user root + group root system oem_2907 + socket thermal-send-client stream 0666 system oem_2907 + socket thermal-recv-client stream 0660 system oem_2907 + socket thermal-recv-passive-client stream 0666 system oem_2907 + socket thermal-send-rule stream 0660 system oem_2907 + disabled diff --git a/rootdir/etc/init/hw/init.mmi.rc b/rootdir/etc/init/hw/init.mmi.rc index ade74a9..9b353b5 100644 --- a/rootdir/etc/init/hw/init.mmi.rc +++ b/rootdir/etc/init/hw/init.mmi.rc @@ -213,9 +213,6 @@ on post-fs-data # Setup folder for aplogd mkdir /data/vendor/aplogd 0770 log log - # Create directory used by chargeonlymode - mkdir /data/vendor/chargeonly 0750 root log - # Subsystem RAM-dumps mkdir /data/vendor/ss-ram-dumps 0750 system log mkdir /data/vendor/ss-ram-dumps/bp-dumps 0750 system log @@ -282,12 +279,6 @@ on boot # Quiet binder logs write /sys/module/binder/parameters/debug_mask 0x5 - # Clear cooldown state - mkdir /mnt/vendor/persist/chargeonly 0770 system system - write /mnt/vendor/persist/chargeonly/cooldown n - chown system system /mnt/vendor/persist/chargeonly/cooldown - chmod 0660 /mnt/vendor/persist/chargeonly/cooldown - # Change owner ship of l5 laser calibration chown camera vendor_tcmd /mnt/vendor/persist/camera/focus/offset_cal chmod 0660 /mnt/vendor/persist/camera/focus/offset_cal @@ -296,16 +287,6 @@ on boot chown system system /sys/class/capsense/reset chown system system /sys/class/capsense/int_state -on charger - trigger early-fs - trigger fs - trigger post-fs - trigger late-fs - trigger post-fs-data - trigger moto-charger - class_stop main - class_stop late_start - on property:sys.boot_completed=1 && property:ro.vendor.zram.swapon=true write /sys/block/zram0/comp_algorithm lz4 write /proc/sys/vm/page-cluster 0 @@ -397,8 +378,3 @@ on property:vendor.hw.touch.status="ready" on property:ro.boot.revision=* setprop ro.boot.hardware.revision ${ro.boot.revision} - -service vendor.charge_only_mode /vendor/bin/charge_only_mode - user root - group graphics system input - disabled diff --git a/sepolicy/vendor/charge_only.te b/sepolicy/vendor/charge_only.te deleted file mode 100644 index 8667682..0000000 --- a/sepolicy/vendor/charge_only.te +++ /dev/null @@ -1,94 +0,0 @@ -type charge_only, domain; -type charge_only_exec, exec_type, vendor_file_type, file_type; -init_daemon_domain(charge_only) - -# Read chargeonly_vendor_data_file -allow charge_only chargeonly_vendor_data_file:dir rw_dir_perms; -allow charge_only chargeonly_vendor_data_file:file create_file_perms; - -# Write to /dev/kmsg -allow charge_only kmsg_device:chr_file rw_file_perms; - -# Read access to pseudo filesystems. -r_dir_file(charge_only, sysfs_type) -r_dir_file(charge_only, rootfs) -r_dir_file(charge_only, cgroup) - -# Self permissions -allow charge_only self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl; - -# Wakelock -wakelock_use(charge_only) - -# Allow access to sysfs -allow charge_only sysfs:dir { read open }; -allow charge_only sysfs:file rw_file_perms; - -# Allow access to wakelock sysfs -allow charge_only sysfs_wake_lock:file rw_file_perms; - -# Allow access to battery info sysfs -allow charge_only sysfs_batteryinfo:file r_file_perms; - -# Allow access to battery supply sysfs -allow charge_only sysfs_battery_supply:dir r_dir_perms; -allow charge_only sysfs_battery_supply:file r_file_perms; -allow charge_only sysfs_battery_supply:lnk_file r_file_perms; - -# Allow access to usb supply sysfs -allow charge_only sysfs_usb_supply:dir r_dir_perms; -allow charge_only sysfs_usb_supply:file r_file_perms; - -# Allow access to thermal sysfs -allow charge_only sysfs_thermal:dir r_dir_perms; -allow charge_only sysfs_thermal:file r_file_perms; -allow charge_only sysfs_thermal:lnk_file r_file_perms; - -# Allow access to power sysfs -allow charge_only sysfs_power:file rw_file_perms; - -# Allow access to graphics sysfs -allow charge_only sysfs_graphics:dir r_dir_perms; -allow charge_only sysfs_graphics:file rw_file_perms; - -# Read /sys/fs/pstore/console-ramoops -# Don't worry about overly broad permissions for now, as there's -# only one file in /sys/fs/pstore -allow charge_only pstorefs:dir r_dir_perms; -allow charge_only pstorefs:file r_file_perms; - -# Allow access to graphics dev -allow charge_only graphics_device:dir r_dir_perms; -allow charge_only graphics_device:chr_file rw_file_perms; - -# Allow access to input dev -allow charge_only input_device:dir r_dir_perms; -allow charge_only input_device:chr_file r_file_perms; - -# Allow access to tty dev -allow charge_only tty_device:chr_file rw_file_perms; - -# Allow access to rtc dev -allow charge_only rtc_device:chr_file rw_file_perms; - -# Allow access to proc_sysrq -allow charge_only proc_sysrq:file rw_file_perms; - -# Allow access to persist dir -allow charge_only persist_chargeonly_file:dir r_dir_perms; -allow charge_only persist_chargeonly_file:file r_file_perms; - -# Allow access to vendor dir -allow charge_only mnt_vendor_file:dir r_dir_perms; - -# Exec shell scripts -allow charge_only vendor_shell_exec:file rx_file_perms; - -# Socks -allow charge_only property_socket:sock_file write; -allow charge_only init:unix_stream_socket connectto; - -# Props -get_prop(charge_only, powerctl_prop) -set_prop(charge_only, powerctl_prop) -get_prop(charge_only, vendor_display_prop) diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index a9a887d..0ffb4c1 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -2,10 +2,6 @@ type vendor_persist_camera_file, file_type, vendor_persist_type; type vendor_imager_metadata_file, file_type, data_file_type; -# charge_only_mode -type chargeonly_vendor_data_file, file_type, data_file_type; -type persist_chargeonly_file, file_type, data_file_type; - # Cutback type cutback_data_file, file_type, data_file_type; type cutback_socket, file_type; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 2581e40..2c0626a 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -39,11 +39,6 @@ # Capsense /(vendor|system/vendor)/bin/capsense_reset u:object_r:capsense_reset_exec:s0 -# Charger -/data/vendor/chargeonly(/.*)? u:object_r:chargeonly_vendor_data_file:s0 -/(mnt/vendor/persist|persist)/chargeonly(/.*)? u:object_r:persist_chargeonly_file:s0 -/(vendor|system/vendor)/bin/charge_only_mode u:object_r:charge_only_exec:s0 - # Fingerprint /(mnt/vendor/persist|persist)/egis(/.*)? u:object_r:vendor_persist_egis_file:s0 /(mnt/vendor/persist|persist)/fps(/.*)? u:object_r:vendor_persist_fps_file:s0