commit ffdf40020b22bbb430999c21de7a70b19de19094
author Ruchi Kandoi <kandoiruchi@google.com> Fri Nov 13 17:43:18 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 13 17:43:18 2015 +0000
tree f42e6e2dc291e82a0a08dbf00c6165cfedcf980a
parent 455d5691e455a113ea8b5b873e3466b9b478923b
parent 2ba9d11e87267128fc6e1c0ff91215dd7edb3e2e

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

* commit '741df1263e2903cba9ebbb333d01654107401378':
  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 },
     };