Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handling removing <original-package> tag" into rvc-qpr-dev

Browse Source
This commit is contained in:
Diksha Gohlyan
2020-09-26 00:25:22 +00:00
committed by Android (Google) Code Review
parent b4289dbe41 27c28b9428
commit a4fbad1f09
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -11115,6 +11115,8 @@ public class PackageManagerService extends IPackageManager.Stub
mSettings.addRenamedPackageLPw(parsedPackage.getRealPackage(), mSettings.addRenamedPackageLPw(parsedPackage.getRealPackage(),
originalPkgSetting.name); originalPkgSetting.name);
mTransferredPackages.add(originalPkgSetting.name); mTransferredPackages.add(originalPkgSetting.name);
} else {
mSettings.removeRenamedPackageLPw(parsedPackage.getPackageName());
} }
} }
if (pkgSetting.sharedUser != null) { if (pkgSetting.sharedUser != null) {

4
services/core/java/com/android/server/pm/Settings.java
View File

@@ -476,6 +476,10 @@ public final class Settings {
return mRenamedPackages.put(pkgName, origPkgName); return mRenamedPackages.put(pkgName, origPkgName);
} }
void removeRenamedPackageLPw(String pkgName) {
mRenamedPackages.remove(pkgName);
}
public boolean canPropagatePermissionToInstantApp(String permName) { public boolean canPropagatePermissionToInstantApp(String permName) {
return mPermissions.canPropagatePermissionToInstantApp(permName); return mPermissions.canPropagatePermissionToInstantApp(permName);
} }