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

Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-26 20:22:49 +00:00
committed by Android (Google) Code Review
parent 7e8fc05295 e2c85890ac
commit e9db00e39f
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2161,6 +2161,18 @@ public class PackageManagerService extends IPackageManager.Stub {
mFirstBoot = !mSettings.readLPw(sUserManager.getUsers(false)); mFirstBoot = !mSettings.readLPw(sUserManager.getUsers(false));
// Clean up orphaned packages for which the code path doesn't exist
// and they are an update to a system app - caused by bug/32321269
final int packageSettingCount = mSettings.mPackages.size();
for (int i = packageSettingCount - 1; i >= 0; i--) {
PackageSetting ps = mSettings.mPackages.valueAt(i);
if (!isExternal(ps) && (ps.codePath == null || !ps.codePath.exists())
&& mSettings.getDisabledSystemPkgLPr(ps.name) != null) {
mSettings.mPackages.removeAt(i);
mSettings.enableSystemPackageLPw(ps.name);
}
}
if (mFirstBoot) { if (mFirstBoot) {
requestCopyPreoptedFiles(); requestCopyPreoptedFiles();
} }
@@ -3115,8 +3127,12 @@ public class PackageManagerService extends IPackageManager.Stub {
flags = updateFlagsForPackage(flags, userId, packageName); flags = updateFlagsForPackage(flags, userId, packageName);
enforceCrossUserPermission(Binder.getCallingUid(), userId, enforceCrossUserPermission(Binder.getCallingUid(), userId,
false /* requireFullPermission */, false /* checkShell */, "get package info"); false /* requireFullPermission */, false /* checkShell */, "get package info");
// reader // reader
synchronized (mPackages) { synchronized (mPackages) {
// Normalize package name to hanlde renamed packages
packageName = normalizePackageNameLPr(packageName);
final boolean matchFactoryOnly = (flags & MATCH_FACTORY_ONLY) != 0; final boolean matchFactoryOnly = (flags & MATCH_FACTORY_ONLY) != 0;
PackageParser.Package p = null; PackageParser.Package p = null;
if (matchFactoryOnly) { if (matchFactoryOnly) {
@@ -3317,8 +3333,12 @@ public class PackageManagerService extends IPackageManager.Stub {
flags = updateFlagsForApplication(flags, userId, packageName); flags = updateFlagsForApplication(flags, userId, packageName);
enforceCrossUserPermission(Binder.getCallingUid(), userId, enforceCrossUserPermission(Binder.getCallingUid(), userId,
false /* requireFullPermission */, false /* checkShell */, "get application info"); false /* requireFullPermission */, false /* checkShell */, "get application info");
// writer // writer
synchronized (mPackages) { synchronized (mPackages) {
// Normalize package name to hanlde renamed packages
packageName = normalizePackageNameLPr(packageName);
PackageParser.Package p = mPackages.get(packageName); PackageParser.Package p = mPackages.get(packageName);
if (DEBUG_PACKAGE_INFO) Log.v( if (DEBUG_PACKAGE_INFO) Log.v(
TAG, "getApplicationInfo " + packageName TAG, "getApplicationInfo " + packageName
@@ -3340,6 +3360,11 @@ public class PackageManagerService extends IPackageManager.Stub {
return null; return null;
} }
private String normalizePackageNameLPr(String packageName) {
String normalizedPackageName = mSettings.mRenamedPackages.get(packageName);
return normalizedPackageName != null ? normalizedPackageName : packageName;
}
@Override @Override
public void freeStorageAndNotify(final String volumeUuid, final long freeStorageSize, public void freeStorageAndNotify(final String volumeUuid, final long freeStorageSize,
final IPackageDataObserver observer) { final IPackageDataObserver observer) {
@@ -19691,6 +19716,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
private void assertPackageKnown(String volumeUuid, String packageName) private void assertPackageKnown(String volumeUuid, String packageName)
throws PackageManagerException { throws PackageManagerException {
synchronized (mPackages) { synchronized (mPackages) {
// Normalize package name to handle renamed packages
packageName = normalizePackageNameLPr(packageName);
final PackageSetting ps = mSettings.mPackages.get(packageName); final PackageSetting ps = mSettings.mPackages.get(packageName);
if (ps == null) { if (ps == null) {
throw new PackageManagerException("Package " + packageName + " is unknown"); throw new PackageManagerException("Package " + packageName + " is unknown");
@@ -19705,6 +19733,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
private void assertPackageKnownAndInstalled(String volumeUuid, String packageName, int userId) private void assertPackageKnownAndInstalled(String volumeUuid, String packageName, int userId)
throws PackageManagerException { throws PackageManagerException {
synchronized (mPackages) { synchronized (mPackages) {
// Normalize package name to handle renamed packages
packageName = normalizePackageNameLPr(packageName);
final PackageSetting ps = mSettings.mPackages.get(packageName); final PackageSetting ps = mSettings.mPackages.get(packageName);
if (ps == null) { if (ps == null) {
throw new PackageManagerException("Package " + packageName + " is unknown"); throw new PackageManagerException("Package " + packageName + " is unknown");