summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-05-19 13:46:29 -0700
committerChristopher Tate <ctate@google.com>2014-05-23 16:41:09 -0700
commitfa380e982e41b0dcbbcf2201803abf26808016b5 (patch)
tree8d418aaa3b36df0b88f98c7c3c6ce1c84b3d2e9e /services/java
parentcd3a8245489fa36c528b075efe99a147cf4f6785 (diff)
downloadframeworks_base-fa380e982e41b0dcbbcf2201803abf26808016b5.zip
frameworks_base-fa380e982e41b0dcbbcf2201803abf26808016b5.tar.gz
frameworks_base-fa380e982e41b0dcbbcf2201803abf26808016b5.tar.bz2
DO NOT MERGE - Run the task manager service at startup
Also moves most of it into android.app.task rather than android.content. (Cherrypick from master) Change-Id: Ic07a664bf54bc3e40aa0b892946edba4bf37262a
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index de46b16..bc34e0e 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -83,6 +83,7 @@ import com.android.server.power.ShutdownThread;
import com.android.server.search.SearchManagerService;
import com.android.server.statusbar.StatusBarManagerService;
import com.android.server.storage.DeviceStorageMonitorService;
+import com.android.server.task.TaskManagerService;
import com.android.server.trust.TrustManagerService;
import com.android.server.tv.TvInputManagerService;
import com.android.server.twilight.TwilightService;
@@ -132,6 +133,8 @@ public final class SystemServer {
"com.android.server.hdmi.HdmiCecService";
private static final String ETHERNET_SERVICE_CLASS =
"com.android.server.ethernet.EthernetService";
+ private static final String TASK_SERVICE_CLASS =
+ "com.android.server.task.TaskManagerService";
private final int mFactoryTestMode;
private Timer mProfilerSnapshotTimer;
@@ -831,6 +834,8 @@ public final class SystemServer {
mSystemServiceManager.startService(UiModeManagerService.class);
+ mSystemServiceManager.startService(TaskManagerService.class);
+
if (!disableNonCoreServices) {
try {
if (pm.hasSystemFeature(PackageManager.FEATURE_BACKUP)) {