From 22f01a2fa0261c5f5601ef500f7516cfc9259933 Mon Sep 17 00:00:00 2001 From: Ajay Dudani Date: Mon, 4 Dec 2017 17:44:01 -0800 Subject: [PATCH] dumpstate: Add battery type to bugreport & fixup sepolicy Add sepolicy for this operation, and update sepolicy to allow collecting batteryinfo in bugreport for user builds. Bug: 70094701, 70094083 Test: Take bugreport, verify battery type is present Change-Id: Id67776301e2ed39a283a08483ac5eb8125aba96b --- dumpstate/DumpstateDevice.cpp | 2 ++ sepolicy/vendor/dumpstate.te | 3 +++ sepolicy/vendor/genfs_contexts | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index cfe9e76a..9d5f041d 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -209,6 +209,8 @@ Return DumpstateDevice::dumpstateBoard(const hidl_handle& handle) { RunCommandToFd(fd, "FP LOGS", {"qsee_logger", "-d"}); } + DumpFileToFd(fd, "Battery type", "/sys/class/power_supply/bms/battery_type"); + RunCommandToFd(fd, "Battery cycle count", {"/vendor/bin/sh", "-c", "for f in 1 2 3 4 5 6 7 8 ; do echo $f > /sys/class/power_supply/bms/cycle_count_id; count=`cat /sys/class/power_supply/bms/cycle_count`; echo \"$f: $count\"; done"}); return Void(); }; diff --git a/sepolicy/vendor/dumpstate.te b/sepolicy/vendor/dumpstate.te index 31e1fe3f..05c68ec6 100644 --- a/sepolicy/vendor/dumpstate.te +++ b/sepolicy/vendor/dumpstate.te @@ -9,3 +9,6 @@ userdebug_or_eng(` binder_call(dumpstate, per_mgr) ') + +allow hal_dumpstate sysfs_batteryinfo:dir search; +allow hal_dumpstate sysfs_batteryinfo:file rw_file_perms; diff --git a/sepolicy/vendor/genfs_contexts b/sepolicy/vendor/genfs_contexts index 6e6f920d..9b8497db 100644 --- a/sepolicy/vendor/genfs_contexts +++ b/sepolicy/vendor/genfs_contexts @@ -53,7 +53,6 @@ genfscon sysfs /devices/soc0 u:object genfscon sysfs /devices/soc/caa0000.qcom,jpeg u:object_r:sysfs_camera:s0 genfscon sysfs /devices/soc/caa4000.qcom,fd u:object_r:sysfs_camera:s0 genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qpnp,fg/power_supply/bms u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qpnp,fg/power_supply/bms/capacity u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qcom,qpnp-smb2/power_supply/battery/capacity u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /bus/msm_subsys u:object_r:sysfs_msm_subsys:s0 genfscon sysfs /module/subsystem_restart u:object_r:sysfs_msm_subsys_restart:s0