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

Commit 891e65c5 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Variant of sendBroadcast with appOp flag for cross-user."

parents 4455f54b 3cf75729

core/java/android/app/ContextImpl.java

+9 −0
Original line number Diff line number Diff line
@@ -1345,6 +1345,15 @@ class ContextImpl extends Context { 
    public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,

            String receiverPermission, BroadcastReceiver resultReceiver, Handler scheduler,

            int initialCode, String initialData, Bundle initialExtras) {

        sendOrderedBroadcastAsUser(intent, user, receiverPermission, AppOpsManager.OP_NONE,

                resultReceiver, scheduler, initialCode, initialData, initialExtras);

    }



    @Override

    public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,

            String receiverPermission, int appOp, BroadcastReceiver resultReceiver,

            Handler scheduler,

            int initialCode, String initialData, Bundle initialExtras) {

        IIntentReceiver rd = null;

        if (resultReceiver != null) {

            if (mPackageInfo != null) {

core/java/android/content/Context.java

+11 −0
Original line number Diff line number Diff line
@@ -1498,6 +1498,17 @@ public abstract class Context { 
            @Nullable Handler scheduler, int initialCode, @Nullable String initialData,

            @Nullable  Bundle initialExtras);



    /**

     * Similar to above but takes an appOp as well, to enforce restrictions.

     * @see #sendOrderedBroadcastAsUser(Intent, UserHandle, String,

     *       BroadcastReceiver, Handler, int, String, Bundle)

     * @hide

     */

    public abstract void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,

            @Nullable String receiverPermission, int appOp, BroadcastReceiver resultReceiver,

            @Nullable Handler scheduler, int initialCode, @Nullable String initialData,

            @Nullable  Bundle initialExtras);



    /**

     * Perform a {@link #sendBroadcast(Intent)} that is "sticky," meaning the

     * Intent you are sending stays around after the broadcast is complete,

core/java/android/content/ContextWrapper.java

+10 −0
Original line number Diff line number Diff line
@@ -418,6 +418,16 @@ public class ContextWrapper extends Context { 
                scheduler, initialCode, initialData, initialExtras);

    }



    /** @hide */

    @Override

    public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,

            String receiverPermission, int appOp, BroadcastReceiver resultReceiver,

            Handler scheduler,

            int initialCode, String initialData, Bundle initialExtras) {

        mBase.sendOrderedBroadcastAsUser(intent, user, receiverPermission, appOp, resultReceiver,

                scheduler, initialCode, initialData, initialExtras);

    }



    @Override

    public void sendStickyBroadcast(Intent intent) {

        mBase.sendStickyBroadcast(intent);

test-runner/src/android/test/mock/MockContext.java

+10 −0
Original line number Diff line number Diff line
@@ -350,7 +350,17 @@ public class MockContext extends Context { 
        throw new UnsupportedOperationException();

    }



    /** @hide */

    @Override

    public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,

            String receiverPermission, int appOp, BroadcastReceiver resultReceiver,

            Handler scheduler,

            int initialCode, String initialData, Bundle initialExtras) {

        throw new UnsupportedOperationException();

    }



    @Override



    public void sendStickyBroadcast(Intent intent) {

        throw new UnsupportedOperationException();

    }

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

+8 −0
Original line number Diff line number Diff line
@@ -1283,6 +1283,14 @@ public final class BridgeContext extends Context { 
        // pass

    }



    @Override

    public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,

            String receiverPermission, int appOp, BroadcastReceiver resultReceiver,

            Handler scheduler,

            int initialCode, String initialData, Bundle initialExtras) {

        // pass

    }



    @Override

    public void sendStickyBroadcast(Intent arg0) {

        // pass