Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43f731ae authored by Yifan Hong's avatar Yifan Hong
Browse files

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
parent 9e2465f5

healthd/BatteryMonitor.cpp

+0 −12
Original line number Diff line number Diff line
@@ -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;

                    }

                }