procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid using Linux sysfs APIs to access battery state on Android

Browse source 
* lisp/battery.el (battery-status-function): Don't look for /sys,
/proc* on Android.  Explain why.
This commit is contained in:
Po Lu 2023-03-10 10:02:36 +08:00
parent 488a75f2e2
commit 417e0539cf
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/battery.el
View file

@ -97,20 +97,21 @@ Value does not include \".\" or \"..\"."
(defcustom battery-status-function
(cond ((member battery-upower-service (dbus-list-activatable-names))
#'battery-upower)
;; Try to find the relevant devices in /sys and /proc on
;; Android as well, in case the system makes them available.
((and (memq system-type '(gnu/linux android))
((and (eq system-type 'gnu/linux)
(file-readable-p "/sys/")
(battery--find-linux-sysfs-batteries))
#'battery-linux-sysfs)
((and (memq system-type '(gnu/linux android))
((and (eq system-type 'gnu/linux)
(file-directory-p "/proc/acpi/battery"))
#'battery-linux-proc-acpi)
((and (memq system-type '(gnu/linux android))
((and (eq system-type 'gnu/linux)
(file-readable-p "/proc/")
(file-readable-p "/proc/apm"))
#'battery-linux-proc-apm)
;; Now try the Android battery status function.
;; Note that even though the Linux kernel APIs are sometimes
;; available on Android, they are badly implemented by Android
;; kernels, so avoid using those.
((eq system-type 'android)
#'battery-android)
((and (eq system-type 'berkeley-unix)