Merge "Start role service earlier." into sc-dev (e7d97083) · Commits · e / os / android_frameworks_base

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -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