Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev am: c4801433d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730656

Change-Id: I3b891f73ada7ec1e53d7e0fe1c7ade81cc23fe0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
YK Hung
2022-04-15 13:30:12 +00:00
committed by Automerger Merge Worker

View File

@@ -625,8 +625,9 @@ public class BatteryEntry {
iconId = R.drawable.ic_settings_phone_idle; iconId = R.drawable.ic_settings_phone_idle;
break; break;
default: default:
name = DebugUtils.constantToString(BatteryConsumer.class, "POWER_COMPONENT_", Log.w(TAG, "unknown attribute:" + DebugUtils.constantToString(
powerComponentId); BatteryConsumer.class, "POWER_COMPONENT_", powerComponentId));
name = null;
iconId = R.drawable.ic_power_system; iconId = R.drawable.ic_power_system;
break; break;
} }