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

Commit d1524600 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents ec5a3865 0826a2b2

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);