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

Commit ac31c262 authored by Diksha Gohlyan's avatar Diksha Gohlyan Committed by Android (Google) Code Review
Browse files

Merge "Handling removing <original-package> tag"

parents 64389beb 4a2c1133

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

+2 −0
Original line number Diff line number Diff line
@@ -11291,6 +11291,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
@@ -485,6 +485,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);

    }