diff options
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 9 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java | 8 |
2 files changed, 15 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 294deba459fe..f9efaaa46de6 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -780,6 +780,11 @@ public final class PowerManagerService extends SystemService batterySaverPolicy, batterySavingStats); } + BatterySaverStateMachine createBatterySaverStateMachine(Object lock, Context context, + BatterySaverController batterySaverController) { + return new BatterySaverStateMachine(lock, context, batterySaverController); + } + NativeWrapper createNativeWrapper() { return new NativeWrapper(); } @@ -864,8 +869,8 @@ public final class PowerManagerService extends SystemService mInjector.createBatterySaverPolicy(mLock, mContext, mBatterySavingStats); mBatterySaverController = mInjector.createBatterySaverController(mLock, mContext, mBatterySaverPolicy, mBatterySavingStats); - mBatterySaverStateMachine = new BatterySaverStateMachine( - mLock, mContext, mBatterySaverController); + mBatterySaverStateMachine = mInjector.createBatterySaverStateMachine(mLock, mContext, + mBatterySaverController); mInattentiveSleepWarningOverlayController = mInjector.createInattentiveSleepWarningController(); diff --git a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java index 5e8de42f8ce0..1a4ce8aa97f8 100644 --- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java @@ -83,6 +83,7 @@ import com.android.server.power.PowerManagerService.NativeWrapper; import com.android.server.power.PowerManagerService.UserSwitchedReceiver; import com.android.server.power.batterysaver.BatterySaverController; import com.android.server.power.batterysaver.BatterySaverPolicy; +import com.android.server.power.batterysaver.BatterySaverStateMachine; import com.android.server.power.batterysaver.BatterySavingStats; import org.junit.After; @@ -109,6 +110,7 @@ public class PowerManagerServiceTest { @Mock private BatterySaverController mBatterySaverControllerMock; @Mock private BatterySaverPolicy mBatterySaverPolicyMock; + @Mock private BatterySaverStateMachine mBatterySaverStateMachineMock; @Mock private LightsManager mLightsManagerMock; @Mock private DisplayManagerInternal mDisplayManagerInternalMock; @Mock private BatteryManagerInternal mBatteryManagerInternalMock; @@ -216,6 +218,12 @@ public class PowerManagerServiceTest { } @Override + BatterySaverStateMachine createBatterySaverStateMachine(Object lock, Context context, + BatterySaverController batterySaverController) { + return mBatterySaverStateMachineMock; + } + + @Override NativeWrapper createNativeWrapper() { return mNativeWrapperMock; } |