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

Commit 3023e081 authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Override registerReceiver methods in test Context to accept flags" am:... 

Merge "Override registerReceiver methods in test Context to accept flags" am: 57ff4b45 am: ebd19a22

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



Change-Id: Ieb23a1f4f61478e26789822cff404197e599d2f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e5e9eeb ebd19a22

tests/utils/testutils/java/com/android/internal/util/test/BroadcastInterceptingContext.java

+28 −1
Original line number Original line Diff line number Diff line
@@ -147,12 +147,39 @@ public class BroadcastInterceptingContext extends ContextWrapper { 




    @Override

    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {

        return registerReceiver(receiver, filter, null, null);

        return registerReceiver(receiver, filter, null, null, 0);

    }



    /**

     * Registers the specified {@code receiver} to listen for broadcasts that match the {@code

     * filter} in the current process.

     *

     * <p>Since this method only listens for broadcasts in the current process, the provided {@code

     * flags} are ignored; this method is primarily intended to allow receivers that register with

     * flags to register in the current process during tests.

     */

    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter, int flags) {

        return registerReceiver(receiver, filter, null, null, flags);

    }

    }





    @Override

    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            String broadcastPermission, Handler scheduler) {

            String broadcastPermission, Handler scheduler) {

        return registerReceiver(receiver, filter, broadcastPermission, scheduler, 0);

    }



    /**

     * Registers the specified {@code receiver} to listen for broadcasts that match the {@code

     * filter} to run in the context of the specified {@code scheduler} in the current process.

     *

     * <p>Since this method only listens for broadcasts in the current process, the provided {@code

     * flags} are ignored; this method is primarily intended to allow receivers that register with

     * flags to register in the current process during tests.

     */

    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            String broadcastPermission, Handler scheduler, int flags) {

        synchronized (mInterceptors) {

        synchronized (mInterceptors) {

            mInterceptors.add(new BroadcastInterceptor(receiver, filter, scheduler));

            mInterceptors.add(new BroadcastInterceptor(receiver, filter, scheduler));

        }

        }