Revert "Allow instant apps to send broadcasts to themselves"

This reverts commit 7b40358fa3.

Reason for revert: False positive - this works and patch not needed.

bug:109583877

Change-Id: If708350b03292cfa3bf9841199739e06c82f6c4f
This commit is contained in:
Svetoslav Ganov
2018-06-07 23:23:39 +00:00
parent 7b40358fa3
commit 971dbcd633

View File

@@ -21021,15 +21021,9 @@ public class ActivityManagerService extends IActivityManager.Stub
}
private List<ResolveInfo> collectReceiverComponents(Intent intent, String resolvedType,
int callingUid, boolean callerInstantApp, int[] users) {
int callingUid, int[] users) {
// TODO: come back and remove this assumption to triage all broadcasts
int pmFlags = STOCK_PM_FLAGS | MATCH_DEBUG_TRIAGED_MISSING;
// Instant apps should be able to send broadcasts to themselves, so we would
// match instant receivers and later the broadcast queue would enforce that
// the broadcast cannot be sent to a receiver outside the instant UID.
if (callerInstantApp) {
pmFlags |= PackageManager.MATCH_INSTANT;
}
List<ResolveInfo> receivers = null;
try {
@@ -21658,8 +21652,7 @@ public class ActivityManagerService extends IActivityManager.Stub
// Need to resolve the intent to interested receivers...
if ((intent.getFlags()&Intent.FLAG_RECEIVER_REGISTERED_ONLY)
== 0) {
receivers = collectReceiverComponents(intent, resolvedType, callingUid,
callerInstantApp, users);
receivers = collectReceiverComponents(intent, resolvedType, callingUid, users);
}
if (intent.getComponent() == null) {
if (userId == UserHandle.USER_ALL && callingUid == SHELL_UID) {