Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37328989 authored by Mugdha Lakhani's avatar Mugdha Lakhani Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Isolated processes must fail registering BRs. am: ca49ddc0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21687822



Change-Id: Ifefa87e56fb41a4395a9b0b184a87ff2411d457c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18e8c65d ca49ddc0

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

+9 −4
Original line number Diff line number Diff line
@@ -13081,12 +13081,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) {

        // Allow Sandbox process to register only unexported receivers.

        if ((flags & Context.RECEIVER_NOT_EXPORTED) != 0) {

        enforceNotIsolatedCaller("registerReceiver");

        } else if (mSdkSandboxSettings.isBroadcastReceiverRestrictionsEnforced()) {

            enforceNotIsolatedOrSdkSandboxCaller("registerReceiver");













        // Allow Sandbox process to register only unexported receivers.













        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