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

Commit 50ee8017 authored by Patrick Baumann's avatar Patrick Baumann
Browse files

Handling removing <original-package> tag 

This reverts commit I7b9d3c786d653a9b00a553e89d7390bcef45c0f2.

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: I198ca545f4fea3ae9d2328a845cbd9167eedf8da
parent 8c7a3252

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

+4 −0
Original line number Diff line number Diff line
@@ -3655,6 +3655,8 @@ public class PackageManagerService extends IPackageManager.Stub 
        PackageParser.readConfigUseRoundIcon(mContext.getResources());















        mServiceStartWithDelay = SystemClock.uptimeMillis() + (60 * 1000L);

























        Slog.i(TAG, "Fix for b/169414761 is applied");















    }





























    /**










@@ -11115,6 +11117,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);















    }