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

[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac am: 2a81b4c908

Browse Source 
am: c893565d24

Change-Id: I3b0abcfcc23b114b38204c0c957acb1316698845
This commit is contained in:
Svetoslav Ganov
2016-10-26 20:45:07 +00:00
committed by android-build-merger
parent 897d5cf56e c893565d24
commit bc3d8e8673
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

@@ -2167,6 +2167,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();
} }
@@ -3126,8 +3138,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) {
@@ -3328,8 +3344,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
@@ -3351,6 +3371,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) {
@@ -19723,6 +19748,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");
@@ -19737,6 +19765,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");