commit eef899f0c4bb255988850795352436f9181cd32c
author Ruchi Kandoi <kandoiruchi@google.com> Fri Nov 13 17:48:43 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 13 17:48:43 2015 +0000
tree 7ec4615db520b86bcdc56c8b4bb7c75d3904d220
parent 9f7b8ca507c32d0e5aa72a8068f55e5186ac758a
parent ffdf40020b22bbb430999c21de7a70b19de19094

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

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

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index 34019fa..582821d 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -139,6 +139,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 },
     };