From 6198955b5ff88436c10bf4c6a1601537e910e7f5 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Fri, 21 Jan 2022 23:32:10 +0800 Subject: [PATCH] sm6225-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 --- rootdir/etc/init.mmi.charge_only.rc | 21 ++++++++------- rootdir/etc/init.mmi.rc | 40 ----------------------------- 2 files changed, 12 insertions(+), 49 deletions(-) diff --git a/rootdir/etc/init.mmi.charge_only.rc b/rootdir/etc/init.mmi.charge_only.rc index 3afbae1..4524d54 100644 --- a/rootdir/etc/init.mmi.charge_only.rc +++ b/rootdir/etc/init.mmi.charge_only.rc @@ -1,17 +1,10 @@ -# 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 chown radio wakelock /sys/power/wake_lock chmod 0660 /sys/power/wake_lock chown radio wakelock /sys/power/wake_unlock chmod 0660 /sys/power/wake_unlock - trigger firmware_mounts_complete - start vendor.charge_only_mode - start vendor.batt_health + start vendor.thermal-com start system_suspend @@ -25,3 +18,13 @@ on moto-charger write /sys/devices/system/cpu/cpu5/online 0 write /sys/devices/system/cpu/cpu6/online 0 write /sys/devices/system/cpu/cpu7/online 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.mmi.rc b/rootdir/etc/init.mmi.rc index b1a39b6..4ac6cee 100644 --- a/rootdir/etc/init.mmi.rc +++ b/rootdir/etc/init.mmi.rc @@ -249,9 +249,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 @@ -322,12 +319,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 @@ -359,16 +350,6 @@ on boot # oneshot # disabled -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 - #service vendor.apanic_annotate /vendor/bin/apanic_save.sh build # class late_start # group log @@ -547,21 +528,6 @@ on property:vendor.hw.touch.status="dead" on property:vendor.hw.touch.status="ready" start vendor.touch-ready-sh -service vendor.charge_only_mode /vendor/bin/charge_only_mode - user root - group graphics system input - disabled - -service vendor.thermal-com /vendor/bin/thermal-engine --minimode - class main - 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 - # bugreport is triggered by holding down volume down, volume up and power service bugreport /system/bin/dumpstate -d -p -B -z \ -o /data/user_de/0/com.android.shell/files/bugreports/bugreport @@ -615,12 +581,6 @@ on property:vendor.wifi.station=false on shutdown exec_start vendor.mmi-shutdown-sh -on property:persist.sys.locale=* - mkdir /mnt/vendor/persist/chargeonly 0770 system system - write /mnt/vendor/persist/chargeonly/locale ${persist.sys.locale} - chown system system /mnt/vendor/persist/chargeonly/locale - chmod 0660 /mnt/vendor/persist/chargeonly/locale - # IKSWQ-149109: Force shutter tone on Japan softbank carrier on property:ro.carrier=softbank setprop audio.camerasound.force true