commit 9c11bff2ef7e573305063815a083f5797f0c6047
author Elliott Hughes <enh@google.com> Thu Feb 04 00:12:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 04 00:12:06 2016 +0000
tree d8191da65cb938a49d4c0fc5d71dc98b8e2726f4
parent c6c1d5142c4259a462cae6288c9e13906a29a22c
parent 78db79de578f9d063bcc467a37940b1fd50d7f3f

Merge "Add support for USB_HVDCP chargers"
am: ba3014c914

* commit 'ba3014c914eb65911b3bb367a1b8e02705ecf398':
  Add support for USB_HVDCP chargers

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index cdfe9c5..8f98f17 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -134,6 +134,7 @@
             { "Mains", ANDROID_POWER_SUPPLY_TYPE_AC },
             { "USB", ANDROID_POWER_SUPPLY_TYPE_USB },
             { "USB_DCP", ANDROID_POWER_SUPPLY_TYPE_AC },
+            { "USB_HVDCP", 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 },
@@ -147,8 +148,10 @@
         return ANDROID_POWER_SUPPLY_TYPE_UNKNOWN;
 
     ret = (BatteryMonitor::PowerSupplyType)mapSysfsString(buf, supplyTypeMap);
-    if (ret < 0)
+    if (ret < 0) {
+        KLOG_WARNING(LOG_TAG, "Unknown power supply type '%s'\n", buf);
         ret = ANDROID_POWER_SUPPLY_TYPE_UNKNOWN;
+    }
 
     return ret;
 }