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

Commit ede7f73f authored by Xinyi Mao's avatar Xinyi Mao Committed by Android (Google) Code Review
Browse files

Merge "Skip load app name from PackageManager while init the BatteryEntry." into main

parents a0badd04 13988cec

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

+1 −13
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.pm.ApplicationInfo; 
import android.content.pm.IPackageManager;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.UserInfo;

import android.graphics.drawable.Drawable;

import android.os.BatteryConsumer;
@@ -176,19 +175,8 @@ public class BatteryEntry { 
                }

            }

            if (mDefaultPackageName != null) {

                PackageManager pm = context.getPackageManager();

                try {

                    ApplicationInfo appInfo =

                            pm.getApplicationInfo(mDefaultPackageName, 0 /* no flags */);

                    mName = pm.getApplicationLabel(appInfo).toString();

                } catch (NameNotFoundException e) {

                    Log.d(

                            TAG,

                            "PackageManager failed to retrieve ApplicationInfo for: "

                                    + mDefaultPackageName);

                mName = mDefaultPackageName;

            }

            }

            mTimeInForegroundMs =

                    uidBatteryConsumer.getTimeInProcessStateMs(

                            UidBatteryConsumer.PROCESS_STATE_FOREGROUND);

tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java

+3 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class BatteryEntryTest { 
                createBatteryEntryForApp(null, APP_DEFAULT_PACKAGE_NAME, HIGH_DRAIN_PACKAGE);



        assertThat(entry.getDefaultPackageName()).isEqualTo(APP_DEFAULT_PACKAGE_NAME);

        assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + APP_DEFAULT_PACKAGE_NAME);

        assertThat(entry.getLabel()).isEqualTo(APP_DEFAULT_PACKAGE_NAME);

    }



    @Test
@@ -152,7 +152,7 @@ public class BatteryEntryTest { 


        BatteryEntry entry = createBatteryEntryForApp(null, null, HIGH_DRAIN_PACKAGE);



        assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + HIGH_DRAIN_PACKAGE);

        assertThat(entry.getLabel()).isEqualTo(HIGH_DRAIN_PACKAGE);

    }



    @Test
@@ -163,7 +163,7 @@ public class BatteryEntryTest { 
                        null,

                        HIGH_DRAIN_PACKAGE);



        assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + HIGH_DRAIN_PACKAGE);

        assertThat(entry.getLabel()).isEqualTo(HIGH_DRAIN_PACKAGE);

    }



    @Test