Merge "Initialize DataManager on boot complete." into main (f414c784) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/flags/people.aconfig

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		package: "com.android.server.flags"
		container: "system"

		flag {
		name: "early_data_manager_init"
		namespace: "system_performance"
		description: "Initialize DataManager earlier in boot"
		bug: "394601872"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.server.people;

		import static com.android.server.flags.Flags.earlyDataManagerInit;

		import android.Manifest;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -116,6 +118,18 @@ public class PeopleService extends SystemService {
		mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);
		}

		@Override
		public void onBootPhase(int phase) {
		if (phase == PHASE_BOOT_COMPLETED) {
		if (earlyDataManagerInit()) {
		// Force initialization of DataManager before onUserUnlocked
		// to avoid blocking the ActivityManagerService on
		// shortcutHandleUnlockUser.
		getDataManager();
		}
		}
		}

		@Override
		public void onUserUnlocked(@NonNull TargetUser user) {
		getDataManager().onUserUnlocked(user.getUserIdentifier());