summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorRichard Uhler <ruhler@google.com>2018-12-31 18:43:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-12-31 18:43:21 +0000
commit474dffd225aeb629c4dc511792dec8413a46540f (patch)
tree694974237484fa6825f224ee4b785ee7cec8e789 /services/java/com/android/server/SystemServer.java
parent3f6d5ebb73f44c069932143883d70aa6d7cd1a97 (diff)
parentb29f145505660b9f0ccc9f1f36373aaf37b50035 (diff)
Merge "Add RollbackManagerService"
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
-rw-r--r--services/java/com/android/server/SystemServer.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 333b3e37ff2a..855fb508ec64 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -123,6 +123,7 @@ import com.android.server.power.ShutdownThread;
import com.android.server.power.ThermalManagerService;
import com.android.server.restrictions.RestrictionsManagerService;
import com.android.server.role.RoleManagerService;
+import com.android.server.rollback.RollbackManagerService;
import com.android.server.security.KeyAttestationApplicationIdProviderService;
import com.android.server.security.KeyChainSystemService;
import com.android.server.signedconfig.SignedConfigService;
@@ -779,6 +780,11 @@ public final class SystemServer {
traceBeginAndSlog("StartLooperStatsService");
mSystemServiceManager.startService(LooperStatsService.Lifecycle.class);
traceEnd();
+
+ // Manages apk rollbacks.
+ traceBeginAndSlog("StartRollbackManagerService");
+ mSystemServiceManager.startService(RollbackManagerService.Lifecycle.class);
+ traceEnd();
}
/**