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

Commit 62964d83 authored by Patrick Baumann's avatar Patrick Baumann Committed by Automerger Merge Worker
Browse files

Merge "Handling removing <original-package> tag" am: e6821587 

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

Change-Id: I20e0937247244ca8f1bb788ca41f12acc0073fee
parents 98da2d69 e6821587

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

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















    }





























    /**










@@ -11096,6 +11098,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);















    }