Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BatteryService: Treat USB charging ports and charging accessories as AC"

Browse Source
This commit is contained in:
Todd Poynor
2013-01-30 23:20:18 +00:00
committed by Android (Google) Code Review
parent b86d026a7f 78d8fe4bd6
commit afae9d248a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/jni/com_android_server_BatteryService.cpp
View File

@@ -215,7 +215,8 @@ static PowerSupplyType readPowerSupplyType(const String8& path) {
buf[length - 1] = 0;
if (strcmp(buf, "Battery") == 0)
return ANDROID_POWER_SUPPLY_TYPE_BATTERY;
else if (strcmp(buf, "Mains") == 0)
else if (strcmp(buf, "Mains") == 0 || strcmp(buf, "USB_DCP") == 0 ||
strcmp(buf, "USB_CDP") == 0 || strcmp(buf, "USB_ACA") == 0)
return ANDROID_POWER_SUPPLY_TYPE_AC;
else if (strcmp(buf, "USB") == 0)
return ANDROID_POWER_SUPPLY_TYPE_USB;