commit 2ba9d11e87267128fc6e1c0ff91215dd7edb3e2e
author Ruchi Kandoi <kandoiruchi@google.com> Fri Nov 13 17:39:54 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 13 17:39:54 2015 +0000
tree d631406c7acde825512130b0d7e12547a3e23b29
parent babddd79f8d83e4d9855dca7084f0e567be0202a
parent fa4ded281dab797005fb585bee1450e6531cae3e

Merge "healthd: Support new PD and USB Type C types"
am: ab75edb4ad

* commit 'ab75edb4ad01b518cb5c96a5a3d4ad344bc4ce26':
  healthd: Support new PD and USB Type C types

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index 2143c0b..0085a07 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -137,6 +137,9 @@
             { "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 },
     };