Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de4cf918 authored by JW Wang's avatar JW Wang
Browse files

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 41a5d353)

Bug: 150347230
Test: m
Merged-In: Ied68ad031f84ea4a416ad779e9ddf4cc912bd7b9
Change-Id: Ied68ad031f84ea4a416ad779e9ddf4cc912bd7b9
parent 22a0b13e

services/java/com/android/server/SystemServer.java

+3 −2
Original line number Diff line number Diff line
@@ -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.