Merge "Some RollbackManagerInternal cleanup (7/n)" (bed62572) · Commits · e / os / android_frameworks_base

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

+2 −7

Original line number	Diff line number	Diff line
		@@ -14479,13 +14479,8 @@ public class PackageManagerService extends IPackageManager.Stub

		if (ps != null && doSnapshotOrRestore) {
		final String seInfo = AndroidPackageUtils.getSeInfo(res.pkg, ps);
		try {
		rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(installedUsers),
		appId, ceDataInode, seInfo, token);
		} catch (RuntimeException re) {
		Log.e(TAG, "Error snapshotting/restoring user data: " + re);
		return false;
		}
		return true;
		}
		return false;

+5 −13

Original line number	Diff line number	Diff line
		@@ -522,13 +522,9 @@ public class StagingManager {

		private void snapshotAndRestoreApexUserData(
		String packageName, int[] allUsers, RollbackManagerInternal rm) {
		try {
		// appId, ceDataInode, and seInfo are not needed for APEXes
		rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(allUsers), 0, 0,
		null, 0 /token/);
		} catch (RuntimeException re) {
		Slog.e(TAG, "Error snapshotting/restoring user data: " + re);
		}
		}

		private void snapshotAndRestoreApkInApexUserData(
		@@ -552,12 +548,8 @@ public class StagingManager {
		final int[] installedUsers = ps.queryInstalledUsers(allUsers, true);

		final String seInfo = AndroidPackageUtils.getSeInfo(pkg, ps);
		try {
		rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(installedUsers),
		appId, ceDataInode, seInfo, 0 /token/);
		} catch (RuntimeException re) {
		Slog.e(TAG, "Error snapshotting/restoring user data: " + re);
		}
		}
		}