diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-04-29 20:33:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-29 20:33:51 +0000 |
| commit | 9ac2718e7dcf274ad41fbb374bedabadc558634b (patch) | |
| tree | 1426dba6414d1ad0109f52e632d16ba54a62b33c /services/java/com/android/server/SystemServer.java | |
| parent | f105f61dd9ff790c6ace406e73c3bddac87a8925 (diff) | |
| parent | 0b4daca9ba54b7252ea8c159218391380eb00c8a (diff) | |
| download | frameworks_base-9ac2718e7dcf274ad41fbb374bedabadc558634b.zip frameworks_base-9ac2718e7dcf274ad41fbb374bedabadc558634b.tar.gz frameworks_base-9ac2718e7dcf274ad41fbb374bedabadc558634b.tar.bz2 | |
Merge "Implement user-settable power save whitelist." into mnc-dev
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 593853c..2922130 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -76,7 +76,6 @@ import com.android.server.pm.Installer; import com.android.server.pm.LauncherAppsService; import com.android.server.pm.PackageManagerService; import com.android.server.pm.UserManagerService; -import com.android.server.power.DeviceIdleController; import com.android.server.power.PowerManagerService; import com.android.server.power.ShutdownThread; import com.android.server.restrictions.RestrictionsManagerService; @@ -599,6 +598,8 @@ public final class SystemServer { mSystemServiceManager.startService(PersistentDataBlockService.class); } + mSystemServiceManager.startService(DeviceIdleController.class); + // Always start the Device Policy Manager, so that the API is compatible with // API8. mSystemServiceManager.startService(DevicePolicyManagerService.Lifecycle.class); @@ -965,7 +966,6 @@ public final class SystemServer { if (!disableNonCoreServices) { mSystemServiceManager.startService(MediaProjectionManagerService.class); - mSystemServiceManager.startService(DeviceIdleController.class); } // Before things start rolling, be sure we have decided whether |