From 15e66cd5af7a08dc603de11cba40eac36d1ed580 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Sat, 14 May 2016 14:47:44 -0600 Subject: [PATCH] Check processName when starting providers. Bug: 28708253 Change-Id: I346441021295273c356619c60caa6086ef165363 --- .../com/android/server/am/ActivityManagerService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ded65569c3951..6e9e520c9ea05 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -239,6 +239,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; @@ -11088,8 +11089,12 @@ public final class ActivityManagerService extends ActivityManagerNative .getPackageInfo(pkgName, matchFlags, userId); if (pkgInfo != null && !ArrayUtils.isEmpty(pkgInfo.providers)) { for (ProviderInfo provInfo : pkgInfo.providers) { - Log.v(TAG, "Installing " + provInfo); - app.thread.scheduleInstallProvider(provInfo); + if (Objects.equals(provInfo.processName, app.processName)) { + Log.v(TAG, "Installing " + provInfo); + app.thread.scheduleInstallProvider(provInfo); + } else { + Log.v(TAG, "Skipping " + provInfo); + } } } } catch (RemoteException ignored) {