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

Commit 9b726e7a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[API Review] Expose sendOrderedBroadcast" into rvc-dev am: 879f32b1 

Change-Id: I95174ab61dea2c06e5eb596f0987ed34298cd972
parents 658de573 879f32b1

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10119,7 +10119,6 @@ package android.content { 
    method public abstract void sendOrderedBroadcast(@RequiresPermission android.content.Intent, @Nullable String);

    method public abstract void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

    method public void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

    method public void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, @Nullable String, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public abstract void sendOrderedBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

    method @Deprecated @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY) public abstract void sendStickyBroadcast(@RequiresPermission android.content.Intent);

    method @Deprecated @RequiresPermission(allOf={"android.permission.INTERACT_ACROSS_USERS", android.Manifest.permission.BROADCAST_STICKY}) public abstract void sendStickyBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);
@@ -10327,6 +10326,7 @@ package android.content { 
    method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, String);

    method public void sendOrderedBroadcast(android.content.Intent, String);

    method public void sendOrderedBroadcast(android.content.Intent, String, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);

    method public void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, int, @Nullable String, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, @Nullable String, @Nullable android.os.Bundle, @Nullable android.os.Bundle);

    method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, String, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);

    method @Deprecated public void sendStickyBroadcast(android.content.Intent);

    method @Deprecated public void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

core/java/android/app/ContextImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -1397,9 +1397,9 @@ class ContextImpl extends Context { 
    }



    @Override

    public void sendOrderedBroadcast(Intent intent, String receiverPermission, String receiverAppOp,

            Bundle options, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode,

            String initialData, @Nullable Bundle initialExtras) {

    public void sendOrderedBroadcast(Intent intent, int initialCode, String receiverPermission,

            String receiverAppOp, BroadcastReceiver resultReceiver, Handler scheduler,

            String initialData, @Nullable Bundle initialExtras, Bundle options) {

        int intAppOp = AppOpsManager.OP_NONE;

        if (!TextUtils.isEmpty(receiverAppOp)) {

            intAppOp = AppOpsManager.strOpToOp(receiverAppOp);

core/java/android/content/Context.java

+5 −4
Original line number Diff line number Diff line
@@ -2543,12 +2543,13 @@ public abstract class Context { 
     *

     * @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)

     * @see android.app.BroadcastOptions

     * @hide

     */

    public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,

    public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent, int initialCode,

            @Nullable String receiverPermission, @Nullable String receiverAppOp,

            @Nullable Bundle options, @Nullable BroadcastReceiver resultReceiver,

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

            @Nullable Bundle initialExtras) {

            @Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,

            @Nullable String initialData, @Nullable Bundle initialExtras,

            @Nullable Bundle options) {

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

    }

core/java/android/content/ContextWrapper.java

+6 −6
Original line number Diff line number Diff line
@@ -600,13 +600,13 @@ public class ContextWrapper extends Context { 
    }



    @Override

    public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,

    public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent, int initialCode,

            @Nullable String receiverPermission, @Nullable String receiverAppOp,

            @Nullable Bundle options, @Nullable BroadcastReceiver resultReceiver,

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

            @Nullable Bundle initialExtras) {

        mBase.sendOrderedBroadcast(intent, receiverPermission, receiverAppOp, options,

                resultReceiver, scheduler, initialCode, initialData, initialExtras);

            @Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,

            @Nullable String initialData, @Nullable Bundle initialExtras,

            @Nullable Bundle options) {

        mBase.sendOrderedBroadcast(intent, initialCode, receiverPermission, receiverAppOp,

                resultReceiver, scheduler, initialData, initialExtras, options);

    }



    @Override

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

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.test.mock;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.app.IApplicationThread;

import android.app.IServiceConnection;
@@ -480,10 +479,11 @@ public class MockContext extends Context { 
        throw new UnsupportedOperationException();

    }



    /** @hide */

    @Override

    public void sendOrderedBroadcast(Intent intent, String receiverPermission, String receiverAppOp,

            Bundle options, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode,

            String initialData, Bundle initialExtras) {

    public void sendOrderedBroadcast(Intent intent, int initialCode, String receiverPermission,

            String receiverAppOp, BroadcastReceiver resultReceiver, Handler scheduler,

            String initialData, Bundle initialExtras, Bundle options) {

        throw new UnsupportedOperationException();

    }