Miscellaneous enhancements

Author: VR-25

META-INF/com/google/android/update-binary

@@ -30,7 +30,7 @@ exxit() {
   rm -rf /dev/.$domain.${id}-install
   $KSU || {
     rm -rf /data/adb/modules_update/$id
-   (abort) > /dev/null
+    (abort) > /dev/null
   }
   echo
   exit $e
@@ -162,9 +162,9 @@ mkdir -p $data_dir/backup
 cp -aH /data/adb/$domain/$id/* $config $data_dir/backup/ 2>/dev/null || :
 
 
-/system/bin/sh $srcDir/install/uninstall.sh install
 KSU=${KSU:-false}
 $KSU || { [ ! -f /data/adb/*/bin/busybox ] || KSU=true; }
+/system/bin/sh $srcDir/install/uninstall.sh install
 cp -R $srcDir/install $installDir/$id
 installDir=$(readlink -f $installDir/$id)
 cp $srcDir/module.prop $installDir/
@@ -305,7 +305,7 @@ printf "$version ($versionCode) installed and running!\n\nRollback with acc -bc
 if [ -x /sbin/${id}d ] || grep -q '#exec_wrapper' /system/bin/${id}d 2>/dev/null; then
   _echo "Rebooting is unnecessary."
 else
-  _echo "Note: If you're not rebooting now, prefix all acc executables with /dev/ (as in /dev/acc -i, /dev/accd). Otherwise, you'll be using the previous installation of those. Reasoning: Magisk, KernelSU and similar, don't remount/update modules without a reboot. Subsequent upgrades won't require a reboot."
+  _echo "Note: If you're not rebooting now, prefix all acc executables with /dev/ (as in /dev/acc -i, /dev/accd). Otherwise, you'll be using the previous installation of those. Reasoning: Magisk, KernelSU and similar, don't remount/update modules without a reboot."
 fi
 
 

README.html

@@ -1440,7 +1440,7 @@ <h2 id="default-configuration">DEFAULT CONFIGURATION<a class="headerlink" href="
 
 // forceOff=force_off=BOOLEAN
 
-// idleApps=idle_apps=(comma or space separated patterns matching Android package names) NULLABLE
+// idleApps=idle_apps=(comma or space-separated patterns matching Android package names) NULLABLE
 
 // idleThreshold=idle_threshold=MILLIAMPS
 
@@ -1678,7 +1678,7 @@ <h2 id="default-configuration">DEFAULT CONFIGURATION<a class="headerlink" href="
 // idle_apps (ia) #
 // Default: Null
 //
-// This is a list of comma or space separated patterns matching Android package names.
+// This is a list of comma or space-separated patterns matching Android package names.
 // When a matched app is running in the foreground, idle mode is enabled.
 // e.g., idleApps=(maps navig somegame) or idleApps=(maps,navig,somegame) or mixed
 
@@ -1801,7 +1801,8 @@ <h2 id="default-configuration">DEFAULT CONFIGURATION<a class="headerlink" href="
 // Default: 5
 //
 // When the battery is discharging, its level/millivolts is at or below shutdown_capacity, and the device has been running for 15 minutes or more, acc daemon turns the device off to reduce the discharge rate, and protect the battery from potential damage, induced by voltage below the operating range.
-// A value of -1 disables it.
+// A value less than 1 disables it.
+// An Android warning notification is posted shortly before the shutdown, giving some time to abort the process.
 
 
 // shutdown_temp (st) #
@@ -1823,8 +1824,9 @@ <h2 id="default-configuration">DEFAULT CONFIGURATION<a class="headerlink" href="
 // Default: mi_thermald
 //
 // [Some] thermal management processes interfere with charging control.
-// This variable controls which of these get temporarily suspended after pausing charging.
-// As a safety measure, if the string does not contain &quot;thermal&quot;, the value is ignored.
+// This variable controls which of these get temporarily suspended after pausing charging (comma-separated list).
+// As a safety measure, if the string does not contain the word &quot;thermal&quot;, the value is ignored.
+// That word alone matches all thermal management processes.
 
 #/DC#
 </pre></div>

README.md

@@ -378,7 +378,7 @@ runCmdOnPause=''
 
 // forceOff=force_off=BOOLEAN
 
-// idleApps=idle_apps=(comma or space separated patterns matching Android package names) NULLABLE
+// idleApps=idle_apps=(comma or space-separated patterns matching Android package names) NULLABLE
 
 // idleThreshold=idle_threshold=MILLIAMPS
 
@@ -616,7 +616,7 @@ runCmdOnPause=''
 // idle_apps (ia) #
 // Default: Null
 //
-// This is a list of comma or space separated patterns matching Android package names.
+// This is a list of comma or space-separated patterns matching Android package names.
 // When a matched app is running in the foreground, idle mode is enabled.
 // e.g., idleApps=(maps navig somegame) or idleApps=(maps,navig,somegame) or mixed
 
@@ -739,7 +739,8 @@ runCmdOnPause=''
 // Default: 5
 //
 // When the battery is discharging, its level/millivolts is at or below shutdown_capacity, and the device has been running for 15 minutes or more, acc daemon turns the device off to reduce the discharge rate, and protect the battery from potential damage, induced by voltage below the operating range.
-// A value of -1 disables it.
+// A value less than 1 disables it.
+// An Android warning notification is posted shortly before the shutdown, giving some time to abort the process.
 
 
 // shutdown_temp (st) #
@@ -761,8 +762,9 @@ runCmdOnPause=''
 // Default: mi_thermald
 //
 // [Some] thermal management processes interfere with charging control.
-// This variable controls which of these get temporarily suspended after pausing charging.
-// As a safety measure, if the string does not contain "thermal", the value is ignored.
+// This variable controls which of these get temporarily suspended after pausing charging (comma-separated list).
+// As a safety measure, if the string does not contain the word "thermal", the value is ignored.
+// That word alone matches all thermal management processes.
 
 #/DC#
 ```

changelog.md

@@ -1,3 +1,90 @@
+**v2024.2.25-rc (202402250)**
+
+- Ability to specify (regex) thermal management processes to temporarily suspend after disabling charging
+- [acc -c d string] Quotes are no longer mandatory
+- Fix config parsing issues
+- Optimize exec wrappers
+
+- Improve the stability of idleApps
+
+- -c|--config h string   Print config help text associated with "string" (config variable, e.g., acc -c h rt (or resume_temp))
+- [acc -f] Don't use scripts from the default config & disengage as soon as the charger is unplugged, regardless of battery level; fix rt issue
+- [acc -i] Avoid duplicate lines & redundant information
+- [acc -p] Filter more useless sysfs nodes
+- Add timestamp to all non-stable flashable zips
+- Always replace one-line scripts with the same name (case-insensitive)
+- Fix idle detection issues
+- Support cooldown_current with temp_level as back-end (e.g., acc -s cdc=60% to limit current by 60%)
+- Support curl binary without --dns-server option (for upgrades)
+- Support Nexus 10 (manta)
+
+- [acc -p] Add filters
+- Also consider pc_port/online for plug state detection
+- Fix accd ungraceful stop issue
+- Minimize the use of subshells
+- Set idleAbovePcap threshold to (pause_capacity + 1)
+- Set millivolts idleAbovePcap threshold to (pause_capacity + 50)
+- Try honoring allowIdleAbovePcap=false only 2x at most, per accd session
+
+- [acc -p] Filter out more useless stuff
+- [acc -t] Add status column hint
+- [acc -t] Show currently set charging switche(s)
+- [accd] Miscellaneous fixes & optimizations
+- [allowIdleAbovePcap=false] Fall back to idle mode as soon as capacity <= pause_capacity
+- [Config updater] Remove redundant text
+- [Refactor] -b[c] restores previous installation; "c" includes the config
+- Fix current and voltage control files parsing logic
+- Optimize busybox handling
+- Patches for KSU/Apatch, install notes and "no reboot needed" workaround
+- Show applied config patches after upgrades (Android notification)
+- Simplify rt-mt logic
+
+- Add debug info to acc-t_output-${device}.log
+- Check dc/online as well for plug state info
+- Fix config printing issues
+- Lower switch test timeout
+- Optimize --info's output
+- Optimize battStatusWorkaround logic
+- Optimize mi_thermald dynamic suspend logic
+- Reset "auto switch" and move it to the end of the list only if unsolicitedResumes = 3, rather than 1
+- Reset switch (in auto-mode) if pbim changes via --set
+- Set defaults allow_idle_above_pcap=false & idle_threshold=30
+- Set discharge_polarity automatically even while charging
+- Support additional busybox paths (including Apatch's)
+
+- Improve charger plug detection
+
+- [push.sh] Support KernelSU
+- Fix typos in doc
+- Improve charger plug detection
+- Recommend trying temp_level if no regular current control file is found
+- Suppress missing current control file errors
+
+- Restore scheduler changes from v2023.11.26-dev
+
+- Implement idle_apps
+- Improve charger online detection
+- Make it possible to post multiple notifications with acc -n
+- Optimize current and voltage logic
+
+- Dynamically pause my_thermald to keep it from disabling idle mode
+- Fix issue with pc, rc, mt and rt null values
+- Fix wizard option 8 (uninstall)
+- Forbid mt - rt > 10 (fallback to rt = mt - 1)
+- Notifications include time
+- Parse current and voltage control files only once per boot session to avoid "false defaults"
+- Rewrite scheduling logic
+- Use hard instead of soft links for KernelSU/Magisk mount files
+
+- Forbid control files modifications by 3rd-party
+- Improve online upgrade, temp_level and schedules logic
+- In acc -c a ': sleep profile; at 22:00 "acc -s pc=60 mcc=500; acc -n \"sleep profile\""', the quotes are optional and all ";" can be replaced with ","
+- Include dmesg and logcat in log archive
+- Support "," in place of "|" for egrep patterns (e.g., acc -i curr,volt; acc -w curr,volt; acc -sp cap,temp)
+- Support unquoted notify string (e.g., acc -n switched to sleep profile)
+- Suppress "Terminated" messages
+
+
 **v2023.10.16 (202310160)**
 - "edit g" shall work with non-root apps (acc -h g, acc -l g, acc -la g)
 - -f supports additional options (e.g., acc -f -sc 500)
@@ -37,15 +124,3 @@
 - 312a429 Update resume_temp information
 - 2744859 Fix module info updater
 - 6dac4a7 resume_temp with trailing r always overrides resume_capacity
-
-**v2023.8.12 (202308120)**
-- -H|--health <mAh>: Print estimated battery health
-- -r|--readme now sends intent to open README.html
-- Additional charging switches
-- Fix set_temp_level() sleep 4;
-- Fixed one-line scripts identifier
-- Fixed random accd crash
-- Implemented resume_temp; deprecated max_temp_pause
-- Refactored edit handler; use "g" (instead of "app") for GUI editor
-- Set default temp_level to null to accommodate battery/siop_level
-- Set list number width to 2 columns

customize.sh

@@ -30,7 +30,7 @@ exxit() {
   rm -rf /dev/.$domain.${id}-install
   $KSU || {
     rm -rf /data/adb/modules_update/$id
-   (abort) > /dev/null
+    (abort) > /dev/null
   }
   echo
   exit $e
@@ -162,9 +162,9 @@ mkdir -p $data_dir/backup
 cp -aH /data/adb/$domain/$id/* $config $data_dir/backup/ 2>/dev/null || :
 
 
-/system/bin/sh $srcDir/install/uninstall.sh install
 KSU=${KSU:-false}
 $KSU || { [ ! -f /data/adb/*/bin/busybox ] || KSU=true; }
+/system/bin/sh $srcDir/install/uninstall.sh install
 cp -R $srcDir/install $installDir/$id
 installDir=$(readlink -f $installDir/$id)
 cp $srcDir/module.prop $installDir/
@@ -305,7 +305,7 @@ printf "$version ($versionCode) installed and running!\n\nRollback with acc -bc
 if [ -x /sbin/${id}d ] || grep -q '#exec_wrapper' /system/bin/${id}d 2>/dev/null; then
   _echo "Rebooting is unnecessary."
 else
-  _echo "Note: If you're not rebooting now, prefix all acc executables with /dev/ (as in /dev/acc -i, /dev/accd). Otherwise, you'll be using the previous installation of those. Reasoning: Magisk, KernelSU and similar, don't remount/update modules without a reboot. Subsequent upgrades won't require a reboot."
+  _echo "Note: If you're not rebooting now, prefix all acc executables with /dev/ (as in /dev/acc -i, /dev/accd). Otherwise, you'll be using the previous installation of those. Reasoning: Magisk, KernelSU and similar, don't remount/update modules without a reboot."
 fi
 
 

install.sh

@@ -30,7 +30,7 @@ exxit() {
   rm -rf /dev/.$domain.${id}-install
   $KSU || {
     rm -rf /data/adb/modules_update/$id
-   (abort) > /dev/null
+    (abort) > /dev/null
   }
   echo
   exit $e
@@ -162,9 +162,9 @@ mkdir -p $data_dir/backup
 cp -aH /data/adb/$domain/$id/* $config $data_dir/backup/ 2>/dev/null || :
 
 
-/system/bin/sh $srcDir/install/uninstall.sh install
 KSU=${KSU:-false}
 $KSU || { [ ! -f /data/adb/*/bin/busybox ] || KSU=true; }
+/system/bin/sh $srcDir/install/uninstall.sh install
 cp -R $srcDir/install $installDir/$id
 installDir=$(readlink -f $installDir/$id)
 cp $srcDir/module.prop $installDir/
@@ -305,7 +305,7 @@ printf "$version ($versionCode) installed and running!\n\nRollback with acc -bc
 if [ -x /sbin/${id}d ] || grep -q '#exec_wrapper' /system/bin/${id}d 2>/dev/null; then
   _echo "Rebooting is unnecessary."
 else
-  _echo "Note: If you're not rebooting now, prefix all acc executables with /dev/ (as in /dev/acc -i, /dev/accd). Otherwise, you'll be using the previous installation of those. Reasoning: Magisk, KernelSU and similar, don't remount/update modules without a reboot. Subsequent upgrades won't require a reboot."
+  _echo "Note: If you're not rebooting now, prefix all acc executables with /dev/ (as in /dev/acc -i, /dev/accd). Otherwise, you'll be using the previous installation of those. Reasoning: Magisk, KernelSU and similar, don't remount/update modules without a reboot."
 fi
 
 

install/default-config.txt

@@ -139,7 +139,7 @@ runCmdOnPause=''
 
 # forceOff=force_off=BOOLEAN
 
-# idleApps=idle_apps=(comma or space separated patterns matching Android package names) NULLABLE
+# idleApps=idle_apps=(comma or space-separated patterns matching Android package names) NULLABLE
 
 # idleThreshold=idle_threshold=MILLIAMPS
 
@@ -377,7 +377,7 @@ runCmdOnPause=''
 # idle_apps (ia) #
 # Default: Null
 #
-# This is a list of comma or space separated patterns matching Android package names.
+# This is a list of comma or space-separated patterns matching Android package names.
 # When a matched app is running in the foreground, idle mode is enabled.
 # e.g., idleApps=(maps navig somegame) or idleApps=(maps,navig,somegame) or mixed
 
@@ -500,7 +500,8 @@ runCmdOnPause=''
 # Default: 5
 #
 # When the battery is discharging, its level/millivolts is at or below shutdown_capacity, and the device has been running for 15 minutes or more, acc daemon turns the device off to reduce the discharge rate, and protect the battery from potential damage, induced by voltage below the operating range.
-# A value of -1 disables it.
+# A value less than 1 disables it.
+# An Android warning notification is posted shortly before the shutdown, giving some time to abort the process.
 
 
 # shutdown_temp (st) #
@@ -522,5 +523,6 @@ runCmdOnPause=''
 # Default: mi_thermald
 #
 # [Some] thermal management processes interfere with charging control.
-# This variable controls which of these get temporarily suspended after pausing charging.
-# As a safety measure, if the string does not contain "thermal", the value is ignored.
+# This variable controls which of these get temporarily suspended after pausing charging (comma-separated list).
+# As a safety measure, if the string does not contain the word "thermal", the value is ignored.
+# That word alone matches all thermal management processes.

module.prop

@@ -1,8 +1,8 @@
 id=acc
 domain=vr25
 name=Advanced Charging Controller (ACC)
-version=v2024.2.11.1-rc
-versionCode=202402111
+version=v2024.2.25-rc
+versionCode=202402250
 author=VR25
 description=Extend your battery's service life by controlling charging current, temperature, and voltage. Any root solution is supported. The installation is always "systemless". Works on Android and KaiOS.
 updateJson=https://raw.githubusercontent.com/VR-25/acc/master/module.json

push.sh

@@ -29,10 +29,14 @@ _adb() {
   fi
 }
 
-if _adb shell su -c "which ksud >/dev/null"; then
+if _adb shell su -c "which apd >/dev/null"; then
+  install="apd module install $dest"
+elif _adb shell su -c "which ksud >/dev/null"; then
   install="ksud module install $dest"
-else
+elif _adb shell su -c "which magisk >/dev/null"; then
   install="magisk --install-module $dest"
+else
+  install=
 fi
 
-_adb push $zip $dest && _adb shell su -c "$install" || :
+[ -z "$install" ] || _adb push $zip $dest && _adb shell su -c "$install" || :