Merge "[archive] fix permission restoration on unarchive after install-archived" into main
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 46692e5..8cc242c 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -829,7 +829,8 @@
if (DEBUG_INSTALL) Log.v(TAG, "+ starting restore round-trip " + token);
- if (request.getReturnCode() == PackageManager.INSTALL_SUCCEEDED && doRestore) {
+ final boolean succeeded = request.getReturnCode() == PackageManager.INSTALL_SUCCEEDED;
+ if (succeeded && doRestore) {
// Pass responsibility to the Backup Manager. It will perform a
// restore if appropriate, then pass responsibility back to the
// Package Manager to run the post-install observer callbacks
@@ -843,10 +844,27 @@
// need to be snapshotted or restored for the package.
//
// TODO(narayan): Get this working for cases where userId == UserHandle.USER_ALL.
- if (request.getReturnCode() == PackageManager.INSTALL_SUCCEEDED && !doRestore && update) {
+ if (succeeded && !doRestore && update) {
doRestore = performRollbackManagerRestore(userId, token, request);
}
+ if (succeeded && !request.hasPostInstallRunnable()) {
+ boolean hasNeverBeenRestored =
+ packageSetting != null && packageSetting.isPendingRestore();
+ request.setPostInstallRunnable(() -> {
+ // Permissions should be restored on each user that has the app installed for the
+ // first time, unless it's an unarchive install for an archived app, in which case
+ // the permissions should be restored on each user that has the app updated.
+ int[] userIdsToRestorePermissions = hasNeverBeenRestored
+ ? request.getUpdateBroadcastUserIds()
+ : request.getFirstTimeBroadcastUserIds();
+ for (int restorePermissionUserId : userIdsToRestorePermissions) {
+ mPm.restorePermissionsAndUpdateRolesForNewUserInstall(request.getName(),
+ restorePermissionUserId);
+ }
+ });
+ }
+
if (doRestore) {
if (packageSetting != null) {
synchronized (mPm.mLock) {
@@ -2851,7 +2869,6 @@
mPm.notifyInstantAppPackageInstalled(request.getPkg().getPackageName(),
request.getNewUsers());
- request.populateBroadcastUsers();
final int[] firstUserIds = request.getFirstTimeBroadcastUserIds();
if (request.getPkg().getStaticSharedLibraryName() == null) {
@@ -2863,12 +2880,6 @@
mPm.mRequiredInstallerPackage,
/* packageSender= */ mPm, launchedForRestore, killApp, update, archived);
- // Work that needs to happen on first install within each user
- for (int userId : firstUserIds) {
- mPm.restorePermissionsAndUpdateRolesForNewUserInstall(packageName,
- userId);
- }
-
if (request.isAllNewUsers() && !update) {
mPm.notifyPackageAdded(packageName, request.getAppId());
} else {
diff --git a/services/core/java/com/android/server/pm/InstallRequest.java b/services/core/java/com/android/server/pm/InstallRequest.java
index 4fb0c22..43075a2 100644
--- a/services/core/java/com/android/server/pm/InstallRequest.java
+++ b/services/core/java/com/android/server/pm/InstallRequest.java
@@ -692,6 +692,14 @@
}
}
+ public void setPostInstallRunnable(Runnable runnable) {
+ mPostInstallRunnable = runnable;
+ }
+
+ public boolean hasPostInstallRunnable() {
+ return mPostInstallRunnable != null;
+ }
+
public void runPostInstallRunnable() {
if (mPostInstallRunnable != null) {
mPostInstallRunnable.run();
@@ -753,6 +761,7 @@
public void setNewUsers(int[] newUsers) {
mNewUsers = newUsers;
+ populateBroadcastUsers();
}
public void setOriginPackage(String originPackage) {
@@ -829,10 +838,11 @@
}
/**
- * Determine the set of users who are adding this package for the first time vs. those who are
- * seeing an update.
+ * Determine the set of users who are adding this package for the first time (aka "new" users)
+ * vs. those who are seeing an update (aka "update" users). The lists can be calculated as soon
+ * as the "new" users are set.
*/
- public void populateBroadcastUsers() {
+ private void populateBroadcastUsers() {
assertScanResultExists();
mFirstTimeBroadcastUserIds = EMPTY_INT_ARRAY;
mFirstTimeBroadcastInstantUserIds = EMPTY_INT_ARRAY;