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

Commit 4a2c1133 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Handling removing <original-package> tag 

Fixes: 169414761
Test: Manual
Test: Add package A
Test: Verify package A exists
Test: Remove A, add package B w/ original-package A
Test: Verify package A exists, but codepath is to package B
Test: Replace package B w/o original-package A
Test: Verify package A removed and package B added
Change-Id: Ib0dbd18fa2f44c2a6b64cc3731d891c44d8d90ab
parent 34741dba

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);

    }