diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2015-11-13 17:39:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-13 17:39:54 +0000 |
| commit | 741df1263e2903cba9ebbb333d01654107401378 (patch) | |
| tree | d631406c7acde825512130b0d7e12547a3e23b29 /healthd | |
| parent | 01f5c3afc861e4cee71ffedb13d319e0e2f884ee (diff) | |
| parent | ab75edb4ad01b518cb5c96a5a3d4ad344bc4ce26 (diff) | |
| download | core-741df1263e2903cba9ebbb333d01654107401378.tar.gz core-741df1263e2903cba9ebbb333d01654107401378.tar.bz2 core-741df1263e2903cba9ebbb333d01654107401378.zip | |
Merge "healthd: Support new PD and USB Type C types"
am: ab75edb4ad
* commit 'ab75edb4ad01b518cb5c96a5a3d4ad344bc4ce26':
healthd: Support new PD and USB Type C types
Diffstat (limited to 'healthd')
| -rw-r--r-- | healthd/BatteryMonitor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index 2143c0b08..0085a078f 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp @@ -137,6 +137,9 @@ BatteryMonitor::PowerSupplyType BatteryMonitor::readPowerSupplyType(const String { "USB_DCP", ANDROID_POWER_SUPPLY_TYPE_AC }, { "USB_CDP", ANDROID_POWER_SUPPLY_TYPE_AC }, { "USB_ACA", ANDROID_POWER_SUPPLY_TYPE_AC }, + { "USB_C", ANDROID_POWER_SUPPLY_TYPE_AC }, + { "USB_PD", ANDROID_POWER_SUPPLY_TYPE_AC }, + { "USB_PD_DRP", ANDROID_POWER_SUPPLY_TYPE_USB }, { "Wireless", ANDROID_POWER_SUPPLY_TYPE_WIRELESS }, { NULL, 0 }, }; |