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

Merge "Pass correct user id to PackageInstaller for uninstall" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-19 17:56:51 +00:00
committed by Android (Google) Code Review
parent ec5a386515 0826a2b219
commit d15246003b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/PackageInstaller/src/com/android/packageinstaller/UninstallUninstalling.java
View File

@@ -83,7 +83,7 @@ public class UninstallUninstalling extends Activity implements
}
UserManager customUserManager = UninstallUninstalling.this
.createContextAsUser(UserHandle.of(user.getIdentifier()), 0)
.createContextAsUser(user, 0)
.getSystemService(UserManager.class);
if (customUserManager.isUserOfType(UserManager.USER_TYPE_PROFILE_CLONE)) {
isCloneUser = true;
@@ -117,7 +117,7 @@ public class UninstallUninstalling extends Activity implements
int flags = allUsers ? PackageManager.DELETE_ALL_USERS : 0;
flags |= keepData ? PackageManager.DELETE_KEEP_DATA : 0;
getPackageManager().getPackageInstaller().uninstall(
createContextAsUser(user, 0).getPackageManager().getPackageInstaller().uninstall(
new VersionedPackage(mAppInfo.packageName,
PackageManager.VERSION_CODE_HIGHEST),
flags, pendingIntent.getIntentSender());

8
packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java Executable file → Normal file
View File

@@ -367,10 +367,10 @@ public class UninstallerActivity extends Activity {
int flags = mDialogInfo.allUsers ? PackageManager.DELETE_ALL_USERS : 0;
flags |= keepData ? PackageManager.DELETE_KEEP_DATA : 0;
getPackageManager().getPackageInstaller().uninstall(
new VersionedPackage(mDialogInfo.appInfo.packageName,
PackageManager.VERSION_CODE_HIGHEST),
flags, pendingIntent.getIntentSender());
createContextAsUser(mDialogInfo.user, 0).getPackageManager().getPackageInstaller()
.uninstall(new VersionedPackage(mDialogInfo.appInfo.packageName,
PackageManager.VERSION_CODE_HIGHEST), flags,
pendingIntent.getIntentSender());
} catch (Exception e) {
notificationManager.cancel(uninstallId);