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

Commit a829c20c authored by Songchun Fan's avatar Songchun Fan
Browse files

[pm] helper class to handle preferred activity 

Also adds a helper class for resolving intent.

Some methods goes through mComputer so I have to keep them in PMS. We
will probably move more things into ComputerEngine later.

BUG: 200582135
BUG: 200616017
Test: manual
Change-Id: I1a0f0298bedd6d60e861a8e58b50c2a349e7e8fb
parent 7dd5f1e0

services/core/java/com/android/server/pm/DeletePackageHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ final class DeletePackageHelper { 
        final SharedUserSetting sus = ps.getSharedUser();

        final List<AndroidPackage> sharedUserPkgs =

                sus != null ? sus.getPackages() : Collections.emptyList();

        final PreferredActivityHelper preferredActivityHelper = new PreferredActivityHelper(mPm);

        final int[] userIds = (userId == UserHandle.USER_ALL) ? mUserManagerInternal.getUserIds()

                : new int[] {userId};

        for (int nextUserId : userIds) {
@@ -476,7 +477,8 @@ final class DeletePackageHelper { 
            }

            PackageManagerService.removeKeystoreDataIfNeeded(mUserManagerInternal, nextUserId,

                    ps.getAppId());

            mPm.clearPackagePreferredActivities(ps.getPackageName(), nextUserId);

            preferredActivityHelper.clearPackagePreferredActivities(ps.getPackageName(),

                    nextUserId);

            mPm.mDomainVerificationManager.clearPackageForUser(ps.getPackageName(), nextUserId);

        }

        mPermissionManager.onPackageUninstalled(ps.getPackageName(), ps.getAppId(), pkg,

services/core/java/com/android/server/pm/PackageManagerService.java

+89 −1304

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/PreferredActivityHelper.java

0 → 100644
+736 −0

File added.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/RemovePackageHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -316,7 +316,9 @@ final class RemovePackageHelper { 
                mPm.mSettings.removeRenamedPackageLPw(deletedPs.getRealName());

            }

            if (changedUsers.size() > 0) {

                mPm.updateDefaultHomeNotLocked(changedUsers);

                final PreferredActivityHelper preferredActivityHelper =

                        new PreferredActivityHelper(mPm);

                preferredActivityHelper.updateDefaultHomeNotLocked(changedUsers);

                mPm.postPreferredActivityChangedBroadcast(UserHandle.USER_ALL);

            }

        }

services/core/java/com/android/server/pm/ResolveIntentHelper.java

0 → 100644
+709 −0

File added.

Preview size limit exceeded, changes collapsed.