commit 06cd1d9b2283e1019dd9f495c36abbb8f63638c8
author The Android Automerger <android-build@google.com> Tue Nov 17 01:01:16 2015 -0800
committer The Android Automerger <android-build@google.com> Tue Nov 17 01:01:16 2015 -0800
tree d151dc6313ca6467b138775186ade1dd3e2c77ac
parent c5e40cd1e73e2e00c4356ec29ffe661a73c7b270
parent 26a9b44993ff3537b86785cc3f11e9a2d39b76d8

merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index 396dfef..3ca4003 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 },
     };