From 5733d9de2ce946789c4d777179eb251cc3526d27 Mon Sep 17 00:00:00 2001 From: Svetoslav Ganov Date: Mon, 23 Jan 2017 14:13:30 -0800 Subject: [PATCH] Allow shared lib and package name to match The old package manager implementation was guarding for shared libs to not match any package name but due to a bug this was not enfroced and as a result we have apps where the package and lib match, e.g. GCore. The new static shared lib support properly enforced the rule breaking apps. So, this CL relexes the constraint. Test: CTS test in the topic passes bug:34598313 Change-Id: I15d22fd1c3a44a27c4b9b8379de3992ae553dd05 --- services/core/java/com/android/server/pm/PackageManagerService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 6044561c5967..7b32d20d76dc 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -9391,8 +9391,7 @@ public class PackageManagerService extends IPackageManager.Stub { } // A package name must be unique; don't allow duplicates - if (mPackages.containsKey(pkg.packageName) - || mSharedLibraries.containsKey(pkg.packageName)) { + if (mPackages.containsKey(pkg.packageName)) { throw new PackageManagerException(INSTALL_FAILED_DUPLICATE_PACKAGE, "Application package " + pkg.packageName + " already installed. Skipping duplicate."); -- 2.11.0