ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "healthd: Read the max power supply voltage" into nyc-dev

Browse source
This commit is contained in:
Ruchi Kandoi 2016-02-25 20:28:19 +00:00 • committed by Android (Google) Code Review
commit df09aefc16
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
healthd/BatteryMonitor.cpp
View file

@ -39,6 +39,8 @@
#define FAKE_BATTERY_CAPACITY 42 #define FAKE_BATTERY_CAPACITY 42
#define FAKE_BATTERY_TEMPERATURE 424 #define FAKE_BATTERY_TEMPERATURE 424
#define ALWAYS_PLUGGED_CAPACITY 100 #define ALWAYS_PLUGGED_CAPACITY 100
#define MILLION 10000000.0
#define DEFAULT_VBUS_VOLTAGE 5000000
namespace android { namespace android {
@ -61,6 +63,7 @@ static void initBatteryProperties(BatteryProperties* props) {
props->chargerUsbOnline = false; props->chargerUsbOnline = false;
props->chargerWirelessOnline = false; props->chargerWirelessOnline = false;
props->maxChargingCurrent = 0; props->maxChargingCurrent = 0;
props->maxChargingVoltage = 0;
props->batteryStatus = BATTERY_STATUS_UNKNOWN; props->batteryStatus = BATTERY_STATUS_UNKNOWN;
props->batteryHealth = BATTERY_HEALTH_UNKNOWN; props->batteryHealth = BATTERY_HEALTH_UNKNOWN;
props->batteryPresent = false; props->batteryPresent = false;
@ -254,6 +257,7 @@ bool BatteryMonitor::update(void) {
props.batteryTechnology = String8(buf); props.batteryTechnology = String8(buf);
unsigned int i; unsigned int i;
double MaxPower = 0;
for (i = 0; i < mChargerNames.size(); i++) { for (i = 0; i < mChargerNames.size(); i++) {
String8 path; String8 path;
@ -282,11 +286,23 @@ bool BatteryMonitor::update(void) {
path.clear(); path.clear();
path.appendFormat("%s/%s/current_max", POWER_SUPPLY_SYSFS_PATH, path.appendFormat("%s/%s/current_max", POWER_SUPPLY_SYSFS_PATH,
mChargerNames[i].string()); mChargerNames[i].string());
if (access(path.string(), R_OK) == 0) { int ChargingCurrent =
int maxChargingCurrent = getIntField(path); (access(path.string(), R_OK) == 0) ? getIntField(path) : 0;
if (props.maxChargingCurrent < maxChargingCurrent) {
props.maxChargingCurrent = maxChargingCurrent; path.clear();
} path.appendFormat("%s/%s/voltage_max", POWER_SUPPLY_SYSFS_PATH,
mChargerNames[i].string());
int ChargingVoltage =
(access(path.string(), R_OK) == 0) ? getIntField(path) :
DEFAULT_VBUS_VOLTAGE;
double power = ((double)ChargingCurrent / MILLION) *
((double)ChargingVoltage / MILLION);
if (MaxPower < power) {
props.maxChargingCurrent = ChargingCurrent;
props.maxChargingVoltage = ChargingVoltage;
MaxPower = power;
} }
} }
} }
@ -416,9 +432,10 @@ void BatteryMonitor::dumpState(int fd) {
int v; int v;
char vs[128]; char vs[128];
snprintf(vs, sizeof(vs), "ac: %d usb: %d wireless: %d current_max: %d\n", snprintf(vs, sizeof(vs), "ac: %d usb: %d wireless: %d current_max: %d voltage_max: %d\n",
props.chargerAcOnline, props.chargerUsbOnline, props.chargerAcOnline, props.chargerUsbOnline,
props.chargerWirelessOnline, props.maxChargingCurrent); props.chargerWirelessOnline, props.maxChargingCurrent,
props.maxChargingVoltage);
write(fd, vs, strlen(vs)); write(fd, vs, strlen(vs));
snprintf(vs, sizeof(vs), "status: %d health: %d present: %d\n", snprintf(vs, sizeof(vs), "status: %d health: %d present: %d\n",
props.batteryStatus, props.batteryHealth, props.batteryPresent); props.batteryStatus, props.batteryHealth, props.batteryPresent);