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

Commit a3bf26d6 authored by Evan Severson's avatar Evan Severson Committed by Android Build Coastguard Worker
Browse files

Add excludedPackages parameter to broadcast 

This parameter is useful for when a broadcast's intent is not targeting
specific package and it is not wanted to be delievered to a specific
one.

Test: Install two apps and create shell command argument to exlude
        packages, verify the correct packages can receive or get
	skipped. Verified with manifest and registered receivers.
Bug: 231635380
Bug: 210118427

Merged-In: I9a331f71c7052b294d4eada0f0f658dba989d881
Change-Id: I9a331f71c7052b294d4eada0f0f658dba989d881
(cherry picked from commit c0ce69bc)
Merged-In: I9a331f71c7052b294d4eada0f0f658dba989d881
parent 4bc03ff2

core/java/android/app/ActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -4366,8 +4366,8 @@ public class ActivityManager { 
        try {

            getService().broadcastIntentWithFeature(

                    null, null, intent, null, null, Activity.RESULT_OK, null, null,

                    null /*requiredPermissions*/, null /*excludedPermissions*/, appOp, null, false,

                    true, userId);

                    null /*requiredPermissions*/, null /*excludedPermissions*/,

                    null /*excludedPackages*/, appOp, null, false, true, userId);

        } catch (RemoteException ex) {

        }

    }

core/java/android/app/ContextImpl.java

+25 −24
Original line number Diff line number Diff line
@@ -1185,7 +1185,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, null, false, false, getUserId());

                    null, AppOpsManager.OP_NONE, null, false, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1202,7 +1202,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, false, false,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, false, false,

                    getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1218,7 +1218,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, false, false,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, false, false,

                    getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1235,8 +1235,8 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, options, false, false,

                    getUserId());

                    null /*excludedPermissions=*/, null /*excludedPackages*/,

                    AppOpsManager.OP_NONE, options, false, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1251,7 +1251,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, false, false,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, false, false,

                    user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1260,7 +1260,7 @@ class ContextImpl extends Context { 


    @Override

    public void sendBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions,

            String[] excludedPermissions) {

            String[] excludedPermissions, String[] excludedPackages) {

        warnIfCallingFromSystemProcess();

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {
@@ -1268,7 +1268,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions, excludedPermissions,

                    AppOpsManager.OP_NONE, null, false, false, getUserId());

                    excludedPackages, AppOpsManager.OP_NONE, null, false, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1285,8 +1285,8 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, options, false, false,

                    getUserId());

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, options, false,

                    false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1303,7 +1303,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, appOp, null, false, false, getUserId());

                    null /*excludedPermissions=*/, null, appOp, null, false, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1320,7 +1320,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, true, false,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, true, false,

                    getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1384,7 +1384,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    rd, initialCode, initialData, initialExtras, receiverPermissions,

                    null /*excludedPermissions=*/, appOp, options, true, false, getUserId());

                    null /*excludedPermissions=*/, null, appOp, options, true, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1398,7 +1398,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, null, false, false, user.getIdentifier());

                    null, AppOpsManager.OP_NONE, null, false, false, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1421,8 +1421,8 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, options, false, false,

                    user.getIdentifier());

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, options, false,

                    false, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1439,7 +1439,8 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, appOp, null, false, false, user.getIdentifier());

                    null /*excludedPermissions=*/, null, appOp, null, false, false,

                    user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1490,7 +1491,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    rd, initialCode, initialData, initialExtras, receiverPermissions,

                    null /*excludedPermissions=*/, appOp, options, true, false,

                    null /*excludedPermissions=*/, null, appOp, options, true, false,

                    user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1532,7 +1533,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, null, false, true, getUserId());

                    null, AppOpsManager.OP_NONE, null, false, true, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1571,7 +1572,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, options, false, true, getUserId());

                    null, AppOpsManager.OP_NONE, options, false, true, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1607,7 +1608,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    rd, initialCode, initialData, initialExtras, null,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, true, true,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, true, true,

                    getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1640,7 +1641,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, null, false, true, user.getIdentifier());

                    null, AppOpsManager.OP_NONE, null, false, true, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1655,7 +1656,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, options, false, true, user.getIdentifier());

                    null, AppOpsManager.OP_NONE, options, false, true, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1690,7 +1691,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    rd, initialCode, initialData, initialExtras, null,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, true, true,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, true, true,

                    user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ interface IActivityManager { 
    int broadcastIntentWithFeature(in IApplicationThread caller, in String callingFeatureId,

            in Intent intent, in String resolvedType, in IIntentReceiver resultTo, int resultCode,

            in String resultData, in Bundle map, in String[] requiredPermissions, in String[] excludePermissions,

            int appOp, in Bundle options, boolean serialized, boolean sticky, int userId);

            in String[] excludePackages, int appOp, in Bundle options, boolean serialized, boolean sticky, int userId);

    void unbroadcastIntent(in IApplicationThread caller, in Intent intent, int userId);

    @UnsupportedAppUsage

    oneway void finishReceiver(in IBinder who, int resultCode, in String resultData, in Bundle map,

core/java/android/content/Context.java

+13 −0
Original line number Diff line number Diff line
@@ -2212,6 +2212,19 @@ public abstract class Context { 
     */

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

            @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions) {

        sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions, null);

    }





    /**

     * Like {@link #sendBroadcastMultiplePermissions(Intent, String[], String[])}, but also allows

     * specification of a list of excluded packages.

     *

     * @hide

     */

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

            @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions,

            @Nullable String[] excludedPackages) {

        throw new RuntimeException("Not implemented. Must override in a subclass.");

    }

core/java/android/content/ContextWrapper.java

+4 −2
Original line number Diff line number Diff line
@@ -494,8 +494,10 @@ public class ContextWrapper extends Context { 
    /** @hide */

    @Override

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

            @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions) {

        mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions);

            @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions,

            @Nullable String[] excludedPackages) {

        mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions,

                excludedPackages);

    }



    /** @hide */