Merge "Handling removing <original-package> tag"

This commit is contained in:
Diksha Gohlyan
2020-09-25 20:51:47 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 0 deletions

View File

@@ -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) {

View File

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