Merge "Start role service earlier." into sc-dev

This commit is contained in:
Hai Zhang
2021-02-02 22:34:27 +00:00
committed by Android (Google) Code Review

View File

@@ -1344,6 +1344,13 @@ public final class SystemServer implements Dumpable {
mSystemServiceManager.startService(DropBoxManagerService.class);
t.traceEnd();
// Grants default permissions and defines roles
t.traceBegin("StartRoleManagerService");
LocalManagerRegistry.addManager(RoleServicePlatformHelper.class,
new RoleServicePlatformHelperImpl(mSystemContext));
mSystemServiceManager.startService(ROLE_SERVICE_CLASS);
t.traceEnd();
t.traceBegin("StartVibratorManagerService");
mSystemServiceManager.startService(VibratorManagerService.Lifecycle.class);
t.traceEnd();
@@ -2060,13 +2067,6 @@ public final class SystemServer implements Dumpable {
t.traceEnd();
}
// Grants default permissions and defines roles
t.traceBegin("StartRoleManagerService");
LocalManagerRegistry.addManager(RoleServicePlatformHelper.class,
new RoleServicePlatformHelperImpl(mSystemContext));
mSystemServiceManager.startService(ROLE_SERVICE_CLASS);
t.traceEnd();
// We need to always start this service, regardless of whether the
// FEATURE_VOICE_RECOGNIZERS feature is set, because it needs to take care
// of initializing various settings. It will internally modify its behavior