commit ee233403579a7250b7a454da7b357f8928479527
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 20 13:36:04 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 20 13:36:04 2018 +0000
tree 9eae6eb839fc25e5c97d06502b002fdefc2a2e19
parent 7cdf159fa08a7f35e1be4dde1a0dc693dd5c5c04
parent 9448724cc2bf241b41a21151d126c9fe11b70676

Merge "Use String.equals when comparing conflicting providers"

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

diff --git a/services/core/java/com/android/server/pm/ComponentResolver.java b/services/core/java/com/android/server/pm/ComponentResolver.java
index 5bf323a..3b11525 100644
--- a/services/core/java/com/android/server/pm/ComponentResolver.java
+++ b/services/core/java/com/android/server/pm/ComponentResolver.java
@@ -1049,7 +1049,7 @@
                                 (other != null && other.getComponentName() != null)
                                         ? other.getComponentName().getPackageName() : "?";
                         // if we're installing over the same already-installed package, this is ok
-                        if (otherPackageName != pkg.packageName) {
+                        if (!otherPackageName.equals(pkg.packageName)) {
                             throw new PackageManagerException(
                                     INSTALL_FAILED_CONFLICTING_PROVIDER,
                                     "Can't install because provider name " + names[j]