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

Commit 5757ea3e authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge changes from topic "send-ordered-broadcast-multiple-permissions" into main am: 2e2b72f8 

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



Change-Id: I789b608e84860f054bc8e8dac76e55e59ff55223
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9955c4a6 2e2b72f8

core/java/android/content/Context.java

+4 −2
Original line number Diff line number Diff line
@@ -2925,10 +2925,12 @@ public abstract class Context { 
     */

    @SuppressWarnings("HiddenAbstractMethod")

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)

    public abstract void sendOrderedBroadcastAsUserMultiplePermissions(Intent intent,

    public void sendOrderedBroadcastAsUserMultiplePermissions(Intent intent,

            UserHandle user, String[] receiverPermissions, int appOp, Bundle options,

            BroadcastReceiver resultReceiver, Handler scheduler, int initialCode,

            String initialData, Bundle initialExtras);

            String initialData, Bundle initialExtras) {

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

    }



    /**

     * Version of