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

Commit 27e9efd7 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Expose Context#sendStickyBroadcast(Intent, Bundle)" am: 846e5f17 am:... 

Merge "Expose Context#sendStickyBroadcast(Intent, Bundle)" am: 846e5f17 am: c9e394fc am: 796c8783

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4d6e07f92301baae6056d0891bc292cbd67450f
parents d197ef1f 796c8783

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10311,6 +10311,7 @@ package android.content { 
    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 @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(android.Manifest.permission.BROADCAST_STICKY) public void sendStickyBroadcast(@NonNull @RequiresPermission android.content.Intent, @Nullable android.os.Bundle);

    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);

    method @Deprecated @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY) public abstract void sendStickyOrderedBroadcast(@RequiresPermission android.content.Intent, android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

    method @Deprecated @RequiresPermission(allOf={"android.permission.INTERACT_ACROSS_USERS", android.Manifest.permission.BROADCAST_STICKY}) public abstract void sendStickyOrderedBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

core/java/android/app/ContextImpl.java

+39 −0
Original line number Diff line number Diff line
@@ -1469,6 +1469,45 @@ class ContextImpl extends Context { 
        }

    }



    /**

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

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

     * so that others can quickly retrieve that data through the return

     * value of {@link #registerReceiver(BroadcastReceiver, IntentFilter)}.  In

     * all other ways, this behaves the same as

     * {@link #sendBroadcast(Intent)}.

     *

     * @deprecated Sticky broadcasts should not be used.  They provide no security (anyone

     * can access them), no protection (anyone can modify them), and many other problems.

     * The recommended pattern is to use a non-sticky broadcast to report that <em>something</em>

     * has changed, with another mechanism for apps to retrieve the current value whenever

     * desired.

     *

     * @param intent The Intent to broadcast; all receivers matching this

     * Intent will receive the broadcast, and the Intent will be held to

     * be re-broadcast to future receivers.

     * @param options (optional) Additional sending options, generated from a

     * {@link android.app.BroadcastOptions}.

     *

     * @see #sendBroadcast(Intent)

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

     */

    @Override

    @Deprecated

    public void sendStickyBroadcast(@NonNull Intent intent, @Nullable Bundle options) {

        warnIfCallingFromSystemProcess();

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

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

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

                    null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, options,

                    false, true, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @Override

    @Deprecated

    public void sendStickyOrderedBroadcast(Intent intent,

core/java/android/content/Context.java

+30 −0
Original line number Diff line number Diff line
@@ -2624,6 +2624,36 @@ public abstract class Context { 
    @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY)

    public abstract void sendStickyBroadcast(@RequiresPermission Intent intent);



    /**

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

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

     * so that others can quickly retrieve that data through the return

     * value of {@link #registerReceiver(BroadcastReceiver, IntentFilter)}.  In

     * all other ways, this behaves the same as

     * {@link #sendBroadcast(Intent)}.

     *

     * @deprecated Sticky broadcasts should not be used.  They provide no security (anyone

     * can access them), no protection (anyone can modify them), and many other problems.

     * The recommended pattern is to use a non-sticky broadcast to report that <em>something</em>

     * has changed, with another mechanism for apps to retrieve the current value whenever

     * desired.

     *

     * @param intent The Intent to broadcast; all receivers matching this

     * Intent will receive the broadcast, and the Intent will be held to

     * be re-broadcast to future receivers.

     * @param options (optional) Additional sending options, generated from a

     * {@link android.app.BroadcastOptions}.

     *

     * @see #sendBroadcast(Intent)

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

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY)

    public void sendStickyBroadcast(@RequiresPermission @NonNull Intent intent,

            @Nullable Bundle options) {

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

    }



    /**

     * <p>Version of {@link #sendStickyBroadcast} that allows you to

     * receive data back from the broadcast.  This is accomplished by

core/java/android/content/ContextWrapper.java

+29 −0
Original line number Diff line number Diff line
@@ -624,6 +624,35 @@ public class ContextWrapper extends Context { 
        mBase.sendStickyBroadcast(intent);

    }



    /**

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

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

     * so that others can quickly retrieve that data through the return

     * value of {@link #registerReceiver(BroadcastReceiver, IntentFilter)}.  In

     * all other ways, this behaves the same as

     * {@link #sendBroadcast(Intent)}.

     *

     * @deprecated Sticky broadcasts should not be used.  They provide no security (anyone

     * can access them), no protection (anyone can modify them), and many other problems.

     * The recommended pattern is to use a non-sticky broadcast to report that <em>something</em>

     * has changed, with another mechanism for apps to retrieve the current value whenever

     * desired.

     *

     * @param intent The Intent to broadcast; all receivers matching this

     * Intent will receive the broadcast, and the Intent will be held to

     * be re-broadcast to future receivers.

     * @param options (optional) Additional sending options, generated from a

     * {@link android.app.BroadcastOptions}.

     *

     * @see #sendBroadcast(Intent)

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

     */

    @Override

    @Deprecated

    public void sendStickyBroadcast(@NonNull Intent intent, @Nullable Bundle options) {

        mBase.sendStickyBroadcast(intent, options);

    }



    @Override

    @Deprecated

    public void sendStickyOrderedBroadcast(Intent intent,

test-mock/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ package android.test.mock { 
    method public void sendOrderedBroadcast(android.content.Intent, String, android.content.BroadcastReceiver, android.os.Handler, int, String, 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 public void sendStickyBroadcast(android.content.Intent);

    method public void sendStickyBroadcast(android.content.Intent, android.os.Bundle);

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

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

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