PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest

Browse Source 
Remove unused code and test

Bug: 290318160
Fix: 290318160
Test: presubmit
Change-Id: I20c612270c67f55e0b01fa849514ba670b696db3
This commit is contained in:
Zaiyue Xue
2023-07-10 15:05:41 +08:00
parent 5a0d4d1cc3
commit c93fe0b509
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
View File

@@ -252,33 +252,6 @@ public class BatteryEntry {
return mPowerComponentId; 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. */ /** Loads the app label and icon image and stores into the cache. */
public static NameAndIcon loadNameAndIcon( public static NameAndIcon loadNameAndIcon(
Context context, Context context,

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

@@ -50,8 +50,6 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import java.util.Locale;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class BatteryEntryTest { public class BatteryEntryTest {
@@ -232,17 +230,6 @@ public class BatteryEntryTest {
assertThat(entry.getTimeInBackgroundMs()).isEqualTo(0); assertThat(entry.getTimeInBackgroundMs()).isEqualTo(0);
} }
@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 @Test
public void getKey_UidBatteryConsumer() { public void getKey_UidBatteryConsumer() {
final BatteryEntry entry = createBatteryEntryForApp(null, null, null); final BatteryEntry entry = createBatteryEntryForApp(null, null, null);