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

Merge "Handling removing <original-package> tag"

Browse Source
This commit is contained in:
Patrick Baumann
2020-10-08 20:46:37 +00:00
committed by Gerrit Code Review
parent dd27d93ad6 015cb11e24
commit e682158745
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3649,6 +3649,8 @@ public class PackageManagerService extends IPackageManager.Stub
PackageParser.readConfigUseRoundIcon(mContext.getResources()); PackageParser.readConfigUseRoundIcon(mContext.getResources());
mServiceStartWithDelay = SystemClock.uptimeMillis() + (60 * 1000L); 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(), 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);
} }