Refactor PowerUsageFeatureProvider: Cache the config set to avoid generating the set again.

Bug: 262802531
Test: manual
Change-Id: I61b36e4e057c432d814aa104a37f0e0d552720cb
This commit is contained in:
Zaiyue Xue
2023-01-10 11:14:14 +08:00
parent 5fc863fc01
commit 7f3ff17bcf
8 changed files with 31 additions and 31 deletions

View File

@@ -64,7 +64,7 @@ public class PowerUsageFeatureProviderImplTest {
@Test
public void testIsBatteryUsageEnabled_returnFalse() {
assertThat(mPowerFeatureProvider.isBatteryUsageEnabled(mContext)).isTrue();
assertThat(mPowerFeatureProvider.isBatteryUsageEnabled()).isTrue();
}
@Test

View File

@@ -101,7 +101,7 @@ public final class BatteryChartPreferenceControllerTest {
doReturn(resources).when(mContext).getResources();
doReturn(Set.of("com.android.gms.persistent"))
.when(mFeatureFactory.powerUsageFeatureProvider)
.getHideApplicationSet(mContext);
.getHideApplicationSet();
doReturn(mLayoutParams).when(mDailyChartView).getLayoutParams();
doReturn(mIntent).when(mContext).registerReceiver(any(), any());
doReturn(100).when(mIntent).getIntExtra(eq(BatteryManager.EXTRA_SCALE), anyInt());

View File

@@ -90,7 +90,7 @@ public final class BatteryUsageBreakdownControllerTest {
doReturn(resources).when(mContext).getResources();
doReturn(Set.of("com.android.gms.persistent"))
.when(mFeatureFactory.powerUsageFeatureProvider)
.getHideApplicationSet(mContext);
.getHideApplicationSet();
mBatteryUsageBreakdownController = createController();
mBatteryUsageBreakdownController.mAppListPreferenceGroup = mAppListPreferenceGroup;
mBatteryDiffEntry = new BatteryDiffEntry(

View File

@@ -1237,7 +1237,7 @@ public final class DataProcessorTest {
final List<Integer> levels = List.of(100, 100);
hourlyBatteryLevelsPerDay.add(
new BatteryLevelData.PeriodBatteryLevelData(timestamps, levels));
when(mPowerUsageFeatureProvider.getHideApplicationSet(mContext))
when(mPowerUsageFeatureProvider.getHideApplicationSet())
.thenReturn(Set.of("package1"));
final Map<Integer, Map<Integer, BatteryDiffData>> resultMap =
@@ -1330,7 +1330,7 @@ public final class DataProcessorTest {
final List<Integer> levels = List.of(100, 100);
hourlyBatteryLevelsPerDay.add(
new BatteryLevelData.PeriodBatteryLevelData(timestamps, levels));
when(mPowerUsageFeatureProvider.getHideBackgroundUsageTimeSet(mContext))
when(mPowerUsageFeatureProvider.getHideBackgroundUsageTimeSet())
.thenReturn(new HashSet(Arrays.asList((CharSequence) "package2")));
final Map<Integer, Map<Integer, BatteryDiffData>> resultMap =