Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index 5c9d071..7bb5a4e 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -625,8 +625,9 @@
iconId = R.drawable.ic_settings_phone_idle;
break;
default:
- name = DebugUtils.constantToString(BatteryConsumer.class, "POWER_COMPONENT_",
- powerComponentId);
+ Log.w(TAG, "unknown attribute:" + DebugUtils.constantToString(
+ BatteryConsumer.class, "POWER_COMPONENT_", powerComponentId));
+ name = null;
iconId = R.drawable.ic_power_system;
break;
}