diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java index ddb8ecbe577..fef30563fe2 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java @@ -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,18 +175,7 @@ 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; - } + mName = mDefaultPackageName; } mTimeInForegroundMs = uidBatteryConsumer.getTimeInProcessStateMs( diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java index 450d058c229..6147778e37a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java @@ -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