diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-08 04:16:24 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-08 04:16:24 +0000 |
| commit | f51c73179c21feffb17b820c87d6583c48048023 (patch) | |
| tree | 1c3d517eae605ff85771c86c8d5489d92b122167 | |
| parent | 8b7a3a985938a7610d3210a6ee56fda851db4180 (diff) | |
| parent | 72b6c9dea8af2b7f05138241291c2654135cc657 (diff) | |
| download | device_google_wahoo-f51c73179c21feffb17b820c87d6583c48048023.tar.gz device_google_wahoo-f51c73179c21feffb17b820c87d6583c48048023.tar.bz2 device_google_wahoo-f51c73179c21feffb17b820c87d6583c48048023.zip | |
Merge cherrypicks of [3581037, 3581038, 3580473, 3580624, 3580656, 3580657, 3580658, 3580382, 3580474, 3580475, 3581039, 3581040, 3580476, 3580206, 3581527, 3580955, 3580956, 3580957, 3580958, 3580959, 3580960, 3580961, 3580962, 3580963, 3580964, 3580965, 3580966, 3581567, 3581568, 3581569, 3581570, 3581571, 3580625, 3580626, 3581587, 3581513, 3581514, 3581515, 3580477, 3581588, 3580659, 3580660, 3580383, 3580384, 3580478, 3580719, 3580479, 3580480, 3581385, 3581528, 3581041, 3581042, 3581043, 3581044, 3581045, 3581046, 3581607, 3580385, 3580481, 3580482, 3580483, 3580661, 3580662, 3580663, 3580664, 3580665, 3580484, 3580485, 3581608, 3581609, 3581610, 3581611, 3581612, 3581589, 3581613, 3580486, 3581519, 3581627, 3581628, 3581529, 3581530, 3581531, 3581629, 3581630] into oc-mr1-release
Change-Id: I861f56ad9abf3de6fe65777e34aa242d7de66365
| -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; |