Merge "Reconcile app data twice to pick up packages installed during unlock" (b2b6da3c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/UserController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -594,6 +594,7 @@ class UserController implements Handler.Callback {

		final TimingsTraceAndSlog t = new TimingsTraceAndSlog();
		t.traceBegin("UM.onBeforeUnlockUser-" + userId);
		final ArraySet<String> reconciledPackages =
		mInjector.getUserManager().onBeforeUnlockUser(userId);
		t.traceEnd();
		synchronized (mLock) {
		@@ -603,6 +604,9 @@ class UserController implements Handler.Callback {
		}
		}
		mInjector.getUserManagerInternal().setUserState(userId, uss.state);
		t.traceBegin("UM.onUserStateRunningUnlocking-" + userId);
		mInjector.getUserManager().onUserStateRunningUnlocking(userId, reconciledPackages);
		t.traceEnd();

		uss.mUnlockProgress.setProgress(20);

services/core/java/com/android/server/pm/PackageManagerService.java

+27 −7

Original line number	Diff line number	Diff line
		@@ -7637,7 +7637,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		List<String> deferPackages = reconcileAppsDataLI(StorageManager.UUID_PRIVATE_INTERNAL,
		UserHandle.USER_SYSTEM, storageFlags, true /* migrateAppData */,
		true /* onlyCoreApps */);
		true /* onlyCoreApps */, null);
		mPrepareAppDataFuture = SystemServerInitThreadPool.submit(() -> {
		TimingsTraceLog traceLog = new TimingsTraceLog("SystemServerTimingAsync",
		Trace.TRACE_TAG_PACKAGE_MANAGER);
		@@ -21636,7 +21636,8 @@ public class PackageManagerService extends IPackageManager.Stub
		try {
		sm.prepareUserStorage(volumeUuid, user.id, user.serialNumber, flags);
		synchronized (mInstallLock) {
		reconcileAppsDataLI(volumeUuid, user.id, flags, true /* migrateAppData */);
		reconcileAppsDataLI(volumeUuid, user.id, flags, true /* migrateAppData */,
		null);
		}
		} catch (IllegalStateException e) {
		// Device was probably ejected, and we'll process that event momentarily
		@@ -21825,21 +21826,32 @@ public class PackageManagerService extends IPackageManager.Stub
		* <p>
		* Verifies that directories exist and that ownership and labeling is
		* correct for all installed apps on all mounted volumes.
		*
		* @param reconciledPackages A set that will be populated with package names that have
		* successfully had their data reconciled. Any package names already
		* contained will be skipped. Because this must be mutable when
		* non-null, it is typed {@link ArraySet} to prevent accidental
		* usage of {@link Collections#emptySet()}. Null can be passed if the
		* caller doesn't need this functionality.
		*/
		void reconcileAppsData(int userId, int flags, boolean migrateAppsData) {
		@NonNull
		void reconcileAppsData(int userId, int flags, boolean migrateAppsData,
		@Nullable ArraySet<String> reconciledPackages) {
		final StorageManager storage = mInjector.getSystemService(StorageManager.class);
		for (VolumeInfo vol : storage.getWritablePrivateVolumes()) {
		final String volumeUuid = vol.getFsUuid();
		synchronized (mInstallLock) {
		reconcileAppsDataLI(volumeUuid, userId, flags, migrateAppsData);
		reconcileAppsDataLI(volumeUuid, userId, flags, migrateAppsData,
		reconciledPackages);
		}
		}
		}

		@GuardedBy("mInstallLock")
		private void reconcileAppsDataLI(String volumeUuid, int userId, int flags,
		boolean migrateAppData) {
		reconcileAppsDataLI(volumeUuid, userId, flags, migrateAppData, false /* onlyCoreApps */);
		boolean migrateAppData, @Nullable ArraySet<String> reconciledPackages) {
		reconcileAppsDataLI(volumeUuid, userId, flags, migrateAppData, false /* onlyCoreApps */,
		reconciledPackages);
		}

		/**
		@@ -21854,7 +21866,8 @@ public class PackageManagerService extends IPackageManager.Stub
		*/
		@GuardedBy("mInstallLock")
		private List<String> reconcileAppsDataLI(String volumeUuid, int userId, int flags,
		boolean migrateAppData, boolean onlyCoreApps) {
		boolean migrateAppData, boolean onlyCoreApps,
		@Nullable ArraySet<String> reconciledPackages) {
		Slog.v(TAG, "reconcileAppsData for " + volumeUuid + " u" + userId + " 0x"
		+ Integer.toHexString(flags) + " migrateAppData=" + migrateAppData);
		List<String> result = onlyCoreApps ? new ArrayList<>() : null;
		@@ -21917,6 +21930,9 @@ public class PackageManagerService extends IPackageManager.Stub
		int preparedCount = 0;
		for (PackageSetting ps : packages) {
		final String packageName = ps.name;
		if (reconciledPackages != null && reconciledPackages.contains(packageName)) {
		continue;
		}
		if (ps.pkg == null) {
		Slog.w(TAG, "Odd, missing scanned package " + packageName);
		// TODO: might be due to legacy ASEC apps; we should circle back
		@@ -21932,6 +21948,10 @@ public class PackageManagerService extends IPackageManager.Stub
		if (ps.getInstalled(userId)) {
		prepareAppDataAndMigrate(batch, ps.pkg, userId, flags, migrateAppData);
		preparedCount++;

		if (reconciledPackages != null) {
		reconciledPackages.add(packageName);
		}
		}
		}
		executeBatchLI(batch);

services/core/java/com/android/server/pm/UserManagerService.java

+33 −5

Original line number	Diff line number	Diff line
		@@ -4805,7 +4805,7 @@ public class UserManagerService extends IUserManager.Stub {
		mUserDataPreparer.prepareUserData(userId, userSerial, StorageManager.FLAG_STORAGE_DE);
		t.traceEnd();
		t.traceBegin("reconcileAppsData");
		mPm.reconcileAppsData(userId, StorageManager.FLAG_STORAGE_DE, migrateAppsData);
		mPm.reconcileAppsData(userId, StorageManager.FLAG_STORAGE_DE, migrateAppsData, null);
		t.traceEnd();

		if (userId != UserHandle.USER_SYSTEM) {
		@@ -4821,11 +4821,14 @@ public class UserManagerService extends IUserManager.Stub {
		/**
		* Called right before a user is unlocked. This gives us a chance to prepare
		* app storage.
		*
		* @return set of packages that reconciled app data
		*/
		public void onBeforeUnlockUser(@UserIdInt int userId) {
		@NonNull public ArraySet<String> onBeforeUnlockUser(@UserIdInt int userId) {
		UserInfo userInfo = getUserInfo(userId);
		if (userInfo == null) {
		return;
		// PMS requires mutable set, so the API uses ArraySet to prevent Collections.emptySet()
		return new ArraySet<>();
		}
		final int userSerial = userInfo.serialNumber;
		// Migrate only if build fingerprints mismatch
		@@ -4836,8 +4839,33 @@ public class UserManagerService extends IUserManager.Stub {
		mUserDataPreparer.prepareUserData(userId, userSerial, StorageManager.FLAG_STORAGE_CE);
		t.traceEnd();

		t.traceBegin("reconcileAppsData-" + userId);
		mPm.reconcileAppsData(userId, StorageManager.FLAG_STORAGE_CE, migrateAppsData);
		final ArraySet<String> reconciledPackages = new ArraySet<>();
		t.traceBegin("reconcileAppsDataFirstPass-" + userId);
		mPm.reconcileAppsData(userId, StorageManager.FLAG_STORAGE_CE, migrateAppsData,
		reconciledPackages);
		t.traceEnd();
		return reconciledPackages;
		}

		/**
		* Called right after a user state is moved to {@link UserState#STATE_RUNNING_UNLOCKING}. This
		* gives us a chance to reconcile app data for apps installed since
		* {@link #onBeforeUnlockUser(int)} was called.
		*
		* @param previouslyReconciledPackages the result from {@link #onBeforeUnlockUser(int)}
		*/
		public void onUserStateRunningUnlocking(@UserIdInt int userId,
		@NonNull ArraySet<String> previouslyReconciledPackages) {
		final UserInfo userInfo = getUserInfo(userId);
		if (userInfo == null) {
		return;
		}
		// Migrate only if build fingerprints mismatch
		boolean migrateAppsData = !Build.FINGERPRINT.equals(userInfo.lastLoggedInFingerprint);
		final TimingsTraceAndSlog t = new TimingsTraceAndSlog();
		t.traceBegin("reconcileAppsDataSecondPass-" + userId);
		mPm.reconcileAppsData(userId, StorageManager.FLAG_STORAGE_CE, migrateAppsData,
		previouslyReconciledPackages);
		t.traceEnd();
		}