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

Merge "Remove context from powerUsageFeatureProvider" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-07-14 08:36:27 +00:00
committed by Android (Google) Code Review
parent 891cb2acb4 36b8227073
commit 0b48ffdd6e
22 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
View File

@@ -57,7 +57,7 @@ public class BatteryInfoLoaderTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
FakeFeatureFactory.setupForTest().getPowerUsageFeatureProvider(mContext);
FakeFeatureFactory.setupForTest().getPowerUsageFeatureProvider();
doReturn(mContext).when(mContext).getApplicationContext();
when(mContext.getSystemService(eq(Context.BATTERY_STATS_SERVICE)))

3
tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -162,8 +162,9 @@ public class FakeFeatureFactory extends FeatureFactory {
return batterySettingsFeatureProvider;
}
@NotNull
@Override
public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
public PowerUsageFeatureProvider getPowerUsageFeatureProvider() {
return powerUsageFeatureProvider;
}