| commit | 1c6695951f13275b9c962b490da570f7c0da69ae | [log] [tgz] |
|---|---|---|
| author | ykhung <ykhung@google.com> | Fri Apr 15 18:52:22 2022 +0800 |
| committer | YK Hung <ykhung@google.com> | Fri Apr 15 11:20:46 2022 +0000 |
| tree | d937d19a9545ad3ea7b1a5bab2be43abc011563f | |
| parent | 361d42afe58bcfd5fbc461ae7a4d6d023000a008 [diff] |
Use the custom name in the battery attribution if it is unknown item Keep the queried name is null to use the custom provided battery attribution name (avoid to replace it with POWER_COMPONENT_ prefix name), such that we can show "TPU", "GPU" ... attribution. old screenshot: https://screenshot.googleplex.com/8KGNxW2eHFY85zw new screenshot: https://screenshot.googleplex.com/8KVj3jBjShfa8wK Bug: 227749579 Test: make RunSettingsRoboTests Change-Id: I22fba3c252a92f7d64670ad5d0f6f3548374968a
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; }