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

Commit 92c80af4 authored by Patrick Baumann's avatar Patrick Baumann
Browse files

RESTRICT AUTOMERGE Revert "Handling removing <original-package> tag" 

This reverts commit 27c28b94.

Change-Id: Ic11952e0ebc913ee453aa47e559b0fd0232816db
Bug: 169414761
parent 5a2b08a5

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

+0 −2
Original line number Diff line number Diff line
@@ -11139,8 +11139,6 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -476,10 +476,6 @@ 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);

    }