Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Some RollbackManagerInternal cleanup (7/n)"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-01 01:27:27 +00:00
committed by Android (Google) Code Review
parent a1525c11b9 de8be88614
commit bed62572c7
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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;
}
rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(installedUsers),
appId, ceDataInode, seInfo, token);
return true;
}
return false;

18
services/core/java/com/android/server/pm/StagingManager.java
View File

@@ -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);
}
// appId, ceDataInode, and seInfo are not needed for APEXes
rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(allUsers), 0, 0,
null, 0 /*token*/);
}
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);
}
rm.snapshotAndRestoreUserData(packageName, UserHandle.toUserHandles(installedUsers),
appId, ceDataInode, seInfo, 0 /*token*/);
}
}