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

Commit 84a2321e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Pass uninstalled PackageSetting to InstantAppRegistry instead of querying"

parents 1035b49a 658b1387

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

+1 −2
Original line number Diff line number Diff line
@@ -338,9 +338,8 @@ class InstantAppRegistry { 
    }



    @GuardedBy("mService.mLock")

    public void onPackageUninstalledLPw(@NonNull AndroidPackage pkg,

    public void onPackageUninstalledLPw(@NonNull AndroidPackage pkg, @Nullable PackageSetting ps,

            @NonNull int[] userIds) {

        PackageSetting ps = mService.getPackageSetting(pkg.getPackageName());

        if (ps == null) {

            return;

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -17502,7 +17502,8 @@ public class PackageManagerService extends IPackageManager.Stub 
            synchronized (mLock) {

                if (res) {

                    if (pkg != null) {

                        mInstantAppRegistry.onPackageUninstalledLPw(pkg, info.removedUsers);

                        mInstantAppRegistry.onPackageUninstalledLPw(pkg, uninstalledPs,

                                info.removedUsers);

                    }

                    updateSequenceNumberLP(uninstalledPs, info.removedUsers);

                    updateInstantAppInstallerLocked(packageName);