diff options
| -rw-r--r-- | services/core/java/com/android/server/UiModeManagerService.java | 7 | ||||
| -rw-r--r-- | services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index dd3de359a01e..f42e32dad4d9 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -165,9 +165,11 @@ final class UiModeManagerService extends SystemService { } @VisibleForTesting - protected UiModeManagerService(Context context, boolean setupWizardComplete) { + protected UiModeManagerService(Context context, boolean setupWizardComplete, + TwilightManager tm) { this(context); mSetupWizardComplete = setupWizardComplete; + mTwilightManager = tm; } private static Intent buildHomeIntent(String category) { @@ -337,7 +339,6 @@ final class UiModeManagerService extends SystemService { mAlarmManager = (AlarmManager) getContext().getSystemService(Context.ALARM_SERVICE); mLocalPowerManager = LocalServices.getService(PowerManagerInternal.class); - mTwilightManager = getLocalService(TwilightManager.class); initPowerSave(); mCarModeEnabled = mDockState == Intent.EXTRA_DOCK_STATE_CAR; registerVrStateListener(); @@ -380,7 +381,7 @@ final class UiModeManagerService extends SystemService { com.android.internal.R.bool.config_enableCarDockHomeLaunch); mUiModeLocked = res.getBoolean(com.android.internal.R.bool.config_lockUiMode); mNightModeLocked = res.getBoolean(com.android.internal.R.bool.config_lockDayNightMode); - + mTwilightManager = getLocalService(TwilightManager.class); final PackageManager pm = context.getPackageManager(); mTelevision = pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION) || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK); diff --git a/services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java index 69ef499749a9..3062584aee20 100644 --- a/services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java @@ -146,7 +146,8 @@ public class UiModeManagerServiceTest extends UiServiceTestCase { addLocalService(PowerManagerInternal.class, mLocalPowerManager); addLocalService(TwilightManager.class, mTwilightManager); - mUiManagerService = new UiModeManagerService(mContext, true); + mUiManagerService = new UiModeManagerService(mContext, true, + mTwilightManager); try { mUiManagerService.onBootPhase(SystemService.PHASE_SYSTEM_SERVICES_READY); } catch (SecurityException e) {/* ignore for permission denial */} |