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

Commit a219fa17 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: 7511d1ed

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



Change-Id: I58362e6e9ac5a07d582e9c43e7b10da116d02bae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 555d08b8 7511d1ed

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -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;

        }

        }