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

Merge "Mock BatterySaverStateMachine in PowerManagerServiceTests" into rvc-dev am: 8dd9111809

Browse Source 
Change-Id: I7cb3c7eaf1adfd900f7e13d1daf2c16c826ba20d
This commit is contained in:
Robert Horvath
2020-03-20 07:53:34 +00:00
committed by Automerger Merge Worker
parent 778b9ba06b 8dd9111809
commit d912933d3a
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -781,6 +781,11 @@ public final class PowerManagerService extends SystemService
batterySaverPolicy, batterySavingStats); batterySaverPolicy, batterySavingStats);
} }
BatterySaverStateMachine createBatterySaverStateMachine(Object lock, Context context,
BatterySaverController batterySaverController) {
return new BatterySaverStateMachine(lock, context, batterySaverController);
}
NativeWrapper createNativeWrapper() { NativeWrapper createNativeWrapper() {
return new NativeWrapper(); return new NativeWrapper();
} }
@@ -865,8 +870,8 @@ public final class PowerManagerService extends SystemService
mInjector.createBatterySaverPolicy(mLock, mContext, mBatterySavingStats); mInjector.createBatterySaverPolicy(mLock, mContext, mBatterySavingStats);
mBatterySaverController = mInjector.createBatterySaverController(mLock, mContext, mBatterySaverController = mInjector.createBatterySaverController(mLock, mContext,
mBatterySaverPolicy, mBatterySavingStats); mBatterySaverPolicy, mBatterySavingStats);
mBatterySaverStateMachine = new BatterySaverStateMachine( mBatterySaverStateMachine = mInjector.createBatterySaverStateMachine(mLock, mContext,
mLock, mContext, mBatterySaverController); mBatterySaverController);
mInattentiveSleepWarningOverlayController = mInattentiveSleepWarningOverlayController =
mInjector.createInattentiveSleepWarningController(); mInjector.createInattentiveSleepWarningController();

8
services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java
View File

@@ -83,6 +83,7 @@ import com.android.server.power.PowerManagerService.NativeWrapper;
import com.android.server.power.PowerManagerService.UserSwitchedReceiver; import com.android.server.power.PowerManagerService.UserSwitchedReceiver;
import com.android.server.power.batterysaver.BatterySaverController; import com.android.server.power.batterysaver.BatterySaverController;
import com.android.server.power.batterysaver.BatterySaverPolicy; import com.android.server.power.batterysaver.BatterySaverPolicy;
import com.android.server.power.batterysaver.BatterySaverStateMachine;
import com.android.server.power.batterysaver.BatterySavingStats; import com.android.server.power.batterysaver.BatterySavingStats;
import org.junit.After; import org.junit.After;
@@ -109,6 +110,7 @@ public class PowerManagerServiceTest {
@Mock private BatterySaverController mBatterySaverControllerMock; @Mock private BatterySaverController mBatterySaverControllerMock;
@Mock private BatterySaverPolicy mBatterySaverPolicyMock; @Mock private BatterySaverPolicy mBatterySaverPolicyMock;
@Mock private BatterySaverStateMachine mBatterySaverStateMachineMock;
@Mock private LightsManager mLightsManagerMock; @Mock private LightsManager mLightsManagerMock;
@Mock private DisplayManagerInternal mDisplayManagerInternalMock; @Mock private DisplayManagerInternal mDisplayManagerInternalMock;
@Mock private BatteryManagerInternal mBatteryManagerInternalMock; @Mock private BatteryManagerInternal mBatteryManagerInternalMock;
@@ -215,6 +217,12 @@ public class PowerManagerServiceTest {
return mBatterySaverControllerMock; return mBatterySaverControllerMock;
} }
@Override
BatterySaverStateMachine createBatterySaverStateMachine(Object lock, Context context,
BatterySaverController batterySaverController) {
return mBatterySaverStateMachineMock;
}
@Override @Override
NativeWrapper createNativeWrapper() { NativeWrapper createNativeWrapper() {
return mNativeWrapperMock; return mNativeWrapperMock;