Merge "Revert "Revert "Allow protected or sticky broadcasts without flags.""" (de761c9f) · Commits · e / os / android_frameworks_base

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

+31 −23

Original line number	Diff line number	Diff line
		@@ -12690,9 +12690,17 @@ public class ActivityManagerService extends IActivityManager.Stub
		"Receiver can't specify both RECEIVER_EXPORTED and RECEIVER_NOT_EXPORTED"
		+ "flag");
		}
		if (CompatChanges.isChangeEnabled(DYNAMIC_RECEIVER_EXPLICIT_EXPORT_REQUIRED,
		callingUid)
		&& !explicitExportStateDefined) {

		// Don't enforce the flag check if we're EITHER registering for only protected
		// broadcasts, or the receiver is null (a sticky broadcast). Sticky broadcasts should
		// not be used generally, so we will be marking them as exported by default
		final boolean requireExplicitFlagForDynamicReceivers = CompatChanges.isChangeEnabled(
		DYNAMIC_RECEIVER_EXPLICIT_EXPORT_REQUIRED, callingUid);
		if (!onlyProtectedBroadcasts) {
		if (receiver == null && !explicitExportStateDefined) {
		// sticky broadcast, no flag specified (flag isn't required)
		flags \|= Context.RECEIVER_EXPORTED;
		} else if (requireExplicitFlagForDynamicReceivers && !explicitExportStateDefined) {
		if (ENFORCE_DYNAMIC_RECEIVER_EXPLICIT_EXPORT) {
		throw new SecurityException(
		callerPackage + ": Targeting T+ (version "
		@@ -12710,12 +12718,12 @@ public class ActivityManagerService extends IActivityManager.Stub
		// Assume default behavior-- flag check is not enforced
		flags \|= Context.RECEIVER_EXPORTED;
		}
		} else if (!CompatChanges.isChangeEnabled(DYNAMIC_RECEIVER_EXPLICIT_EXPORT_REQUIRED,
		callingUid)) {
		} else if (!requireExplicitFlagForDynamicReceivers) {
		// Change is not enabled, thus not targeting T+. Assume exported.
		flags \|= Context.RECEIVER_EXPORTED;
		}
		}
		}

		// Dynamic receivers are exported by default for versions prior to T
		final boolean exported = (flags & Context.RECEIVER_EXPORTED) != 0;
		@@ -12731,7 +12739,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		(intent.getFlags() & Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS) == 0) {
		continue;
		}
		// If intent has scheme "content", it will need to acccess
		// If intent has scheme "content", it will need to access
		// provider that needs to lock mProviderMap in ActivityThread
		// and also it may need to wait application response, so we
		// cannot lock ActivityManagerService here.