Merge "Mock BatterySaverStateMachine in PowerManagerServiceTests" into rvc-dev... (0c6f5441) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/PowerManagerService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -781,6 +781,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();
		}
		@@ -865,8 +870,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();

+8 −0

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -215,6 +217,12 @@ public class PowerManagerServiceTest {
		return mBatterySaverControllerMock;
		}

		@Override
		BatterySaverStateMachine createBatterySaverStateMachine(Object lock, Context context,
		BatterySaverController batterySaverController) {
		return mBatterySaverStateMachineMock;
		}

		@Override
		NativeWrapper createNativeWrapper() {
		return mNativeWrapperMock;