Merge "First <provider> always wins."

2014-02-11 21:25:45 +00:00
parent 2e1ff903b8 c6809bb685
commit 7b0e282715
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -6111,6 +6111,11 @@ public class PackageManagerService extends IPackageManager.Stub {
        }

        public final void addProvider(PackageParser.Provider p) {
+            if (mProviders.containsKey(p.getComponentName())) {
+                Slog.w(TAG, "Provider " + p.getComponentName() + " already defined; ignoring");
+                return;
+            }
+
            mProviders.put(p.getComponentName(), p);
            if (DEBUG_SHOW_INFO) {
                Log.v(TAG, "  "