diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-21 21:26:06 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-21 21:26:06 +0000 |
commit | 6758e5f35800e2a6537f2efb4650a81dbb30de7a (patch) | |
tree | 2251b0e7069c9d00d8899cb8b3a0200759a82c8b | |
parent | c5c8c0cdc7ce4bcc067968d5080d4f477b0e9409 (diff) | |
parent | 7ea9b3164552606a74c2b58815eaa0bf947c5b3f (diff) | |
download | device_google_wahoo-6758e5f35800e2a6537f2efb4650a81dbb30de7a.tar.gz device_google_wahoo-6758e5f35800e2a6537f2efb4650a81dbb30de7a.tar.bz2 device_google_wahoo-6758e5f35800e2a6537f2efb4650a81dbb30de7a.zip |
Snap for 4657601 from 7ea9b3164552606a74c2b58815eaa0bf947c5b3f to oc-m4-release
Change-Id: I19be21d1eae37af2ec5d70e24919a403029f49bc
-rwxr-xr-x | dumpstate/DumpstateDevice.cpp | 2 | ||||
-rw-r--r-- | sepolicy/vendor/dumpstate.te | 3 | ||||
-rw-r--r-- | sepolicy/vendor/genfs_contexts | 1 | ||||
-rw-r--r-- | sepolicy/vendor/hal_power_default.te | 3 | ||||
-rw-r--r-- | sepolicy/vendor/kernel.te | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index efcf8bcf..f50919cd 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -216,6 +216,8 @@ Return<void> 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 ce328ce8..e9932005 100644 --- a/sepolicy/vendor/dumpstate.te +++ b/sepolicy/vendor/dumpstate.te @@ -11,3 +11,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 6acbe849..58e4014a 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 diff --git a/sepolicy/vendor/hal_power_default.te b/sepolicy/vendor/hal_power_default.te index aa92c358..b588634b 100644 --- a/sepolicy/vendor/hal_power_default.te +++ b/sepolicy/vendor/hal_power_default.te @@ -4,10 +4,7 @@ allow hal_power_default perfd_socket:sock_file write; allow hal_power_default sysfs_graphics:dir search; allow hal_power_default sysfs_graphics:file r_file_perms; -userdebug_or_eng(` -# debugfs entries are only needed in user-debug or eng builds allow hal_power_default debugfs_rpm:file r_file_perms; allow hal_power_default debugfs_wlan:dir r_dir_perms; allow hal_power_default debugfs_wlan:file r_file_perms; -') diff --git a/sepolicy/vendor/kernel.te b/sepolicy/vendor/kernel.te index 23686463..d2bf9c0f 100644 --- a/sepolicy/vendor/kernel.te +++ b/sepolicy/vendor/kernel.te @@ -1,7 +1,6 @@ # for diag over socket userdebug_or_eng(` allow kernel self:socket create; - allow kernel debugfs_wlan:dir search; ') allow kernel vendor_firmware_file:dir search; @@ -12,3 +11,5 @@ dontaudit kernel kernel:system module_request; allow kernel debugfs_ipc:dir search; allow kernel persist_file:dir search; + +allow kernel debugfs_wlan:dir search; |