Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5084bf8b authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Use the custom name in the battery attribution if it is unknown item"... 

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

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



Change-Id: Ie15b204a471c88ecb8792dae932b7980aab84dd2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01700783 84e451d7

src/com/android/settings/fuelgauge/BatteryEntry.java

+3 −2
Original line number Diff line number Diff line
@@ -625,8 +625,9 @@ public class BatteryEntry { 
                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;

        }