Merge "DO NOT MERGE Isolated processes must fail registering BRs." into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
49c9a522e7
@@ -13117,12 +13117,17 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||
public Intent registerReceiverWithFeature(IApplicationThread caller, String callerPackage,
|
||||
String callerFeatureId, String receiverId, IIntentReceiver receiver,
|
||||
IntentFilter filter, String permission, int userId, int flags) {
|
||||
enforceNotIsolatedCaller("registerReceiver");
|
||||
|
||||
// Allow Sandbox process to register only unexported receivers.
|
||||
if ((flags & Context.RECEIVER_NOT_EXPORTED) != 0) {
|
||||
enforceNotIsolatedCaller("registerReceiver");
|
||||
} else if (mSdkSandboxSettings.isBroadcastReceiverRestrictionsEnforced()) {
|
||||
enforceNotIsolatedOrSdkSandboxCaller("registerReceiver");
|
||||
boolean unexported = (flags & Context.RECEIVER_NOT_EXPORTED) != 0;
|
||||
if (mSdkSandboxSettings.isBroadcastReceiverRestrictionsEnforced()
|
||||
&& Process.isSdkSandboxUid(Binder.getCallingUid())
|
||||
&& !unexported) {
|
||||
throw new SecurityException("SDK sandbox process not allowed to call "
|
||||
+ "registerReceiver");
|
||||
}
|
||||
|
||||
ArrayList<Intent> stickyIntents = null;
|
||||
ProcessRecord callerApp = null;
|
||||
final boolean visibleToInstantApps
|
||||
|
||||
Reference in New Issue
Block a user