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

Browse Source
This commit is contained in:
Jeff Sharkey
2016-05-18 18:52:02 +00:00
committed by Android (Google) Code Review
parent 1a9158e271 15e66cd5af
commit 6bd012a799
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.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
@@ -11124,8 +11125,12 @@ public final class ActivityManagerService extends ActivityManagerNative
.getPackageInfo(pkgName, matchFlags, userId); .getPackageInfo(pkgName, matchFlags, userId);
if (pkgInfo != null && !ArrayUtils.isEmpty(pkgInfo.providers)) { if (pkgInfo != null && !ArrayUtils.isEmpty(pkgInfo.providers)) {
for (ProviderInfo provInfo : pkgInfo.providers) { for (ProviderInfo provInfo : pkgInfo.providers) {
Log.v(TAG, "Installing " + provInfo); if (Objects.equals(provInfo.processName, app.processName)) {
app.thread.scheduleInstallProvider(provInfo); Log.v(TAG, "Installing " + provInfo);
app.thread.scheduleInstallProvider(provInfo);
} else {
Log.v(TAG, "Skipping " + provInfo);
}
} }
} }
} catch (RemoteException ignored) { } catch (RemoteException ignored) {