From de4cf91872ab3517471dad9294f09b3fb3e0ee88 Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Thu, 27 Feb 2020 15:25:09 +0800
Subject: [PATCH] Don't reference RollbackManagerService directly (2/n)

This is an effort to modularize RollbackManager.

As we move RollbackManagerService to apex/, SystemServer can't reference
RollbackManagerService directly. Let's use the class name to start the
service.

(Cherry-picked from 41a5d353ccf96c3e115355c6333bca7657dff29b)

Bug: 150347230
Test: m
Merged-In: Ied68ad031f84ea4a416ad779e9ddf4cc912bd7b9
Change-Id: Ied68ad031f84ea4a416ad779e9ddf4cc912bd7b9
---
 services/java/com/android/server/SystemServer.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index b019e9dd03bae..c631eebe4a019 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -144,7 +144,6 @@ import com.android.server.power.ThermalManagerService;
 import com.android.server.recoverysystem.RecoverySystemService;
 import com.android.server.restrictions.RestrictionsManagerService;
 import com.android.server.role.RoleManagerService;
-import com.android.server.rollback.RollbackManagerService;
 import com.android.server.security.FileIntegrityService;
 import com.android.server.security.KeyAttestationApplicationIdProviderService;
 import com.android.server.security.KeyChainSystemService;
@@ -294,6 +293,8 @@ public final class SystemServer {
             "com.android.server.DeviceIdleController";
     private static final String BLOB_STORE_MANAGER_SERVICE_CLASS =
             "com.android.server.blob.BlobStoreManagerService";
+    private static final String ROLLBACK_MANAGER_SERVICE_CLASS =
+            "com.android.server.rollback.RollbackManagerService";
 
     private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";
 
@@ -964,7 +965,7 @@ public final class SystemServer {
 
         // Manages apk rollbacks.
         t.traceBegin("StartRollbackManagerService");
-        mSystemServiceManager.startService(RollbackManagerService.class);
+        mSystemServiceManager.startService(ROLLBACK_MANAGER_SERVICE_CLASS);
         t.traceEnd();
 
         // Service to capture bugreports.