diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-04-27 09:47:32 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-04-29 12:38:09 -0700 |
| commit | 0b4daca9ba54b7252ea8c159218391380eb00c8a (patch) | |
| tree | f613c1a320934f01ec040427c84ee00371cb13fe /services/java | |
| parent | 5686780404a41901d226cc7ba506c1c0ba284713 (diff) | |
| download | frameworks_base-0b4daca9ba54b7252ea8c159218391380eb00c8a.zip frameworks_base-0b4daca9ba54b7252ea8c159218391380eb00c8a.tar.gz frameworks_base-0b4daca9ba54b7252ea8c159218391380eb00c8a.tar.bz2 | |
Implement user-settable power save whitelist.
The whitelist is now maintained by DeviceIdleController,
which is moving out into its own independent system service.
Network stats now queries it for the whitelist, instead of
collecting that itself.
Also did a few improvements in alarm manager -- made the
code for moving alarms out of the pending list more robust,
and fixed the debug output to always print the contents of
the pending list even if we aren't in a pending state. (That
would have helped me identify the problem much earlier.)
Change-Id: I0f7119d4c553c3af4d77b2f71246fa6e2c13c561
Diffstat (limited to 'services/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 |