Merge "Fix "Request to restore userData ..." log spam." (43e98970) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+33 −24

Original line number	Diff line number	Diff line
		@@ -966,13 +966,27 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
		}

		getHandler().post(() -> {
		restoreUserDataInternal(packageName, userIds, appId, ceDataInode, seInfo, token);
		final PackageManagerInternal pmi = LocalServices.getService(
		PackageManagerInternal.class);
		pmi.finishPackageInstall(token, false);
		});
		}

		private void restoreUserDataInternal(String packageName, int[] userIds, int appId,
		long ceDataInode, String seInfo, int token) {
		final RollbackData rollbackData = getRollbackForPackage(packageName);
		for (int userId : userIds) {
		if (rollbackData == null \|\| !rollbackData.inProgress) {
		if (rollbackData == null) {
		return;
		}

		if (!rollbackData.inProgress) {
		Log.e(TAG, "Request to restore userData for: " + packageName
		+ ", but no rollback in progress.");
		continue;
		return;
		}

		for (int userId : userIds) {
		final PackageRollbackInfo info = getPackageRollbackInfo(rollbackData, packageName);
		final boolean changedRollbackData = mAppDataRollbackHelper.restoreAppData(
		rollbackData.rollbackId, info, userId, appId, seInfo);
		@@ -989,11 +1003,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
		}
		}
		}

		final PackageManagerInternal pmi = LocalServices.getService(
		PackageManagerInternal.class);
		pmi.finishPackageInstall(token, false);
		});
		}

		@Override