Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check processName when starting providers." into nyc-dev am: 6bd012a799

Browse Source 
am: 9208ed4c91

* commit '9208ed4c91220e2e76320bd4d8cfd8bc0a889754':
  Check processName when starting providers.

Change-Id: I509d197eaff9149a3c5db91870e4841c11cf9d62
This commit is contained in:
Jeff Sharkey
2016-05-18 19:07:00 +00:00
committed by android-build-merger
parent 2018eae94f 9208ed4c91
commit 5d25ac90d2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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) {
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) {