diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java index 7f86b7cf192..86538ee8811 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java @@ -252,33 +252,6 @@ public class BatteryEntry { return mPowerComponentId; } - void getQuickNameIconForUid( - final int uid, final String[] packages, final boolean loadDataInBackground) { - // Locale sync to system config in Settings - final Locale locale = Locale.getDefault(); - if (sCurrentLocale != locale) { - clearUidCache(); - sCurrentLocale = locale; - } - - final String uidString = Integer.toString(uid); - if (sUidCache.containsKey(uidString)) { - UidToDetail utd = sUidCache.get(uidString); - mDefaultPackageName = utd.mPackageName; - mName = utd.mName; - mIcon = utd.mIcon; - return; - } - - if (packages == null || packages.length == 0) { - final NameAndIcon nameAndIcon = getNameAndIconFromUid(mContext, mName, uid); - mIcon = nameAndIcon.mIcon; - mName = nameAndIcon.mName; - } else { - mIcon = mContext.getPackageManager().getDefaultActivityIcon(); - } - } - /** Loads the app label and icon image and stores into the cache. */ public static NameAndIcon loadNameAndIcon( Context context, 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 07b3b3481c8..108d6e2244d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java @@ -51,8 +51,6 @@ import org.mockito.junit.MockitoRule; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import java.util.Locale; - @RunWith(RobolectricTestRunner.class) public class BatteryEntryTest { @@ -234,17 +232,6 @@ public class BatteryEntryTest { } @Ignore - @Test - public void testUidCache_switchLocale_shouldCleanCache() { - Locale.setDefault(new Locale("en_US")); - BatteryEntry.sUidCache.put(Integer.toString(APP_UID), null); - assertThat(BatteryEntry.sUidCache).isNotEmpty(); - - Locale.setDefault(new Locale("zh_TW")); - createBatteryEntryForApp(null, null, HIGH_DRAIN_PACKAGE); - assertThat(BatteryEntry.sUidCache).isEmpty(); // check if cache is clear - } - @Test public void getKey_UidBatteryConsumer() { final BatteryEntry entry = createBatteryEntryForApp(null, null, null);