commit 4bd54c70fa37909fdd7c764d9995c132e7cc137d
author Svetoslav Ganov <svetoslavganov@google.com> Mon Jan 23 22:25:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 23 22:25:48 2017 +0000
tree 912de5cdf679b297735bf5f8dc3b10fdb5b6c8a0
parent 6500b1450d277b40a9059bd80694028ac58a7d01
parent 5733d9de2ce946789c4d777179eb251cc3526d27

Merge "Allow shared lib and package name to match"

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 6044561..7b32d20 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 @@
             }
 
             // 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.");