summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-07-29 19:14:24 +0100
committerBen Murdoch <benm@google.com>2014-08-01 14:24:47 +0100
commit4dbeb359b2cfeb63d6ec3ecb702f2bd836db058a (patch)
treefdded63f6c0e1c9dff148f70ea5c0f49eee6aa9c /services/java/com/android/server/SystemServer.java
parent161536b5970ba5ab43233e7695ef69ba2bb804f4 (diff)
downloadframeworks_base-4dbeb359b2cfeb63d6ec3ecb702f2bd836db058a.zip
frameworks_base-4dbeb359b2cfeb63d6ec3ecb702f2bd836db058a.tar.gz
frameworks_base-4dbeb359b2cfeb63d6ec3ecb702f2bd836db058a.tar.bz2
Cherry pick Make WebViewUpdateService a SystemService. DO NOT MERGE
Migrate WebViewUpdateService to the newer SystemService approach instead of ServiceManager.addService. Original Bug: 16403706 Original Change-Id: I21aa67a41c22c3c20ba9e82eb87e5d610fe130e8 Bug: 16723226 Change-Id: Id276b71ee547e683f0756bcee0f4978ce342c2af
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
-rw-r--r--services/java/com/android/server/SystemServer.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 6f185d5..e8d6773 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -376,6 +376,9 @@ public final class SystemServer {
mSystemServiceManager.startService(UsageStatsService.class);
mActivityManagerService.setUsageStatsManager(
LocalServices.getService(UsageStatsManagerInternal.class));
+
+ // Tracks whether the updatable WebView is in a ready state and watches for update installs.
+ mSystemServiceManager.startService(WebViewUpdateService.class);
}
/**
@@ -422,9 +425,6 @@ public final class SystemServer {
Slog.i(TAG, "Reading configuration...");
SystemConfig.getInstance();
- Slog.i(TAG, "WebView Update Service");
- ServiceManager.addService("webviewupdate", new WebViewUpdateService(context));
-
Slog.i(TAG, "Scheduling Policy");
ServiceManager.addService("scheduling_policy", new SchedulingPolicyService());