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

Commit 7e18214d authored by Diksha Gohlyan's avatar Diksha Gohlyan Committed by Automerger Merge Worker
Browse files

Merge "Handling removing <original-package> tag" into rvc-qpr-dev am: a4fbad1f 

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

Change-Id: I98cd05498dd656060408712cb281f33681583dcb
parents 641b12e3 a4fbad1f

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

+2 −0
Original line number Diff line number Diff line
@@ -11115,6 +11115,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                mSettings.addRenamedPackageLPw(parsedPackage.getRealPackage(),

                        originalPkgSetting.name);

                mTransferredPackages.add(originalPkgSetting.name);

            } else {

                mSettings.removeRenamedPackageLPw(parsedPackage.getPackageName());

            }

        }

        if (pkgSetting.sharedUser != null) {

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

+4 −0
Original line number Diff line number Diff line
@@ -476,6 +476,10 @@ public final class Settings { 
        return mRenamedPackages.put(pkgName, origPkgName);

    }



    void removeRenamedPackageLPw(String pkgName) {

        mRenamedPackages.remove(pkgName);

    }



    public boolean canPropagatePermissionToInstantApp(String permName) {

        return mPermissions.canPropagatePermissionToInstantApp(permName);

    }