Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 007b61ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22722663



Change-Id: I105d2f71f7c195304250e3c2332ff00d14c31a7d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 201c7eb9 d1524600

packages/PackageInstaller/src/com/android/packageinstaller/UninstallUninstalling.java

+2 −2
Original line number Diff line number Diff line
@@ -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());

packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java

100755 → 100644
+4 −4
Original line number Diff line number Diff line
@@ -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);