commit bfd551eaac737de627084ce7fbf82fc1192d769c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 02 02:48:54 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 02 02:48:54 2018 +0000
tree 0632b53f46946523c9b6d1ec09c64df1b58f8541
parent b3bc4c01c876e9fb130dd329587a4cc312f09527
parent c328093a5e3c2e7e635fc1c3fae2a1cd011a4856

Merge "healthd: Remove access to /sys/class/power_supply/battery/batt_vol and batt_temp"

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index de48adb..2553ffa 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -535,12 +535,6 @@
                                       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 @@
                                       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;
                     }
                 }