From 43f731ae459ebecbed0042d17addf77413ae05fe Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 1 Feb 2018 13:44:23 -0800 Subject: [PATCH] healthd: Remove access to /sys/class/power_supply/battery/batt_vol and batt_temp These are custom paths from early Android devices that the framework used to read, and that code was copied into healthd. Removed because this is not defined in upstream kernel. Change-Id: I375a8a62610c1235d82c1f27568437b16e0f96a8 Fixes: 72824944 Test: health 2.0 VTS test --- healthd/BatteryMonitor.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index de48adbd3..2553ffa30 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp @@ -535,12 +535,6 @@ void BatteryMonitor::init(struct healthd_config *hc) { POWER_SUPPLY_SYSFS_PATH, name); if (access(path, R_OK) == 0) { mHealthdConfig->batteryVoltagePath = path; - } else { - path.clear(); - path.appendFormat("%s/%s/batt_vol", - POWER_SUPPLY_SYSFS_PATH, name); - if (access(path, R_OK) == 0) - mHealthdConfig->batteryVoltagePath = path; } } @@ -590,12 +584,6 @@ void BatteryMonitor::init(struct healthd_config *hc) { name); if (access(path, R_OK) == 0) { mHealthdConfig->batteryTemperaturePath = path; - } else { - path.clear(); - path.appendFormat("%s/%s/batt_temp", - POWER_SUPPLY_SYSFS_PATH, name); - if (access(path, R_OK) == 0) - mHealthdConfig->batteryTemperaturePath = path; } }