Merge "Check processName when starting providers." into nyc-dev (6bd012a7) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -240,6 +240,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;
		@@ -11124,8 +11125,12 @@ public final class ActivityManagerService extends ActivityManagerNative
		.getPackageInfo(pkgName, matchFlags, userId);
		if (pkgInfo != null && !ArrayUtils.isEmpty(pkgInfo.providers)) {
		for (ProviderInfo provInfo : pkgInfo.providers) {
		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) {