summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-03-19 23:05:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-19 23:05:16 +0000
commit79ec42e6a3c6a6f6a00ef3ad92221a5ad2149aa9 (patch)
treea117c0350ba0eccf49450ced9c60b6a31a6bbb14 /services/java/com
parent4dd12ef0c548603be256b189e37b0a314829e719 (diff)
parent8ad2af7e5b28f71e7bdfc1bb097937c6c1d22b18 (diff)
downloadframeworks_base-79ec42e6a3c6a6f6a00ef3ad92221a5ad2149aa9.zip
frameworks_base-79ec42e6a3c6a6f6a00ef3ad92221a5ad2149aa9.tar.gz
frameworks_base-79ec42e6a3c6a6f6a00ef3ad92221a5ad2149aa9.tar.bz2
Merge "First stab at device idle mode."
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/SystemServer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index a0c7f86..ed55c56 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -960,6 +960,7 @@ public final class SystemServer {
if (!disableNonCoreServices) {
mSystemServiceManager.startService(MediaProjectionManagerService.class);
+ mSystemServiceManager.startService(DeviceIdleController.class);
}
// Before things start rolling, be sure we have decided whether