Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Dependency.get usages from BatteryControllerImpl

Browse Source 
Test: atest SystemUITests
Change-Id: I115c55af157410fccbf13db326ca246993cbb6e0
This commit is contained in:
Jason Monk
2018-12-21 14:06:00 -05:00
parent 8111bccc42
commit de48d5df49
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java
View File

@@ -30,7 +30,6 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
import com.android.settingslib.utils.PowerUtil;
import com.android.systemui.Dependency;
import com.android.systemui.power.EnhancedEstimates;
import com.android.systemui.power.Estimate;
@@ -55,7 +54,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private static final int UPDATE_GRANULARITY_MSEC = 1000 * 60;
private final EnhancedEstimates mEstimates = Dependency.get(EnhancedEstimates.class);
private final EnhancedEstimates mEstimates;
private final ArrayList<BatteryController.BatteryStateChangeCallback> mChangeCallbacks = new ArrayList<>();
private final PowerManager mPowerManager;
private final Handler mHandler;
@@ -73,15 +72,17 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
private long mLastEstimateTimestamp = -1;
@Inject
public BatteryControllerImpl(Context context) {
this(context, context.getSystemService(PowerManager.class));
public BatteryControllerImpl(Context context, EnhancedEstimates enhancedEstimates) {
this(context, enhancedEstimates, context.getSystemService(PowerManager.class));
}
@VisibleForTesting
BatteryControllerImpl(Context context, PowerManager powerManager) {
BatteryControllerImpl(Context context, EnhancedEstimates enhancedEstimates,
PowerManager powerManager) {
mContext = context;
mHandler = new Handler();
mPowerManager = powerManager;
mEstimates = enhancedEstimates;
registerReceiver();
updatePowerSave();

5
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryControllerTest.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.policy;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.content.Intent;
@@ -26,6 +27,7 @@ import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.power.EnhancedEstimates;
import org.junit.Assert;
import org.junit.Before;
@@ -47,7 +49,8 @@ public class BatteryControllerTest extends SysuiTestCase {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mBatteryController = new BatteryControllerImpl(getContext(), mPowerManager);
mBatteryController = new BatteryControllerImpl(getContext(), mock(EnhancedEstimates.class),
mPowerManager);
}
@Test