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

Commit 407c8c4f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixing a build breakage caused by an incorrect link. Version code for... 

Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe18 am: 3b449c24

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

Change-Id: Ibbd974649418e4cc97668992be4af09026ff88d6
parents f9391d05 3b449c24

core/java/android/content/Context.java

+4 −4
Original line number Diff line number Diff line
@@ -3002,7 +3002,7 @@ public abstract class Context { 
     * @param receiver The BroadcastReceiver to handle the broadcast.

     * @param filter Selects the Intent broadcasts to be received.

     * @param flags Additional options for the receiver. As of

     * {@link android.os.Build.VERSION_CODES#TIRAMISU}, either {@link #RECEIVER_EXPORTED} or

     * Android T, either {@link #RECEIVER_EXPORTED} or

     * {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being registered

     *            for protected broadcasts, and may additionally specify

     *            {@link #RECEIVER_VISIBLE_TO_INSTANT_APPS} if {@link #RECEIVER_EXPORTED} is
@@ -3079,7 +3079,7 @@ public abstract class Context { 
     * @param scheduler Handler identifying the thread that will receive

     *      the Intent.  If null, the main thread of the process will be used.

     * @param flags Additional options for the receiver. As of

     * {@link android.os.Build.VERSION_CODES#TIRAMISU}, either {@link #RECEIVER_EXPORTED} or

     * Android T, either {@link #RECEIVER_EXPORTED} or

     * {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being registered

     *            for protected broadcasts, and may additionally specify

     *            {@link #RECEIVER_VISIBLE_TO_INSTANT_APPS} if {@link #RECEIVER_EXPORTED} is
@@ -3143,7 +3143,7 @@ public abstract class Context { 
     * @param scheduler Handler identifying the thread that will receive

     *      the Intent. If {@code null}, the main thread of the process will be used.

     * @param flags Additional options for the receiver. As of

     *      {@link android.os.Build.VERSION_CODES#TIRAMISU}, either {@link #RECEIVER_EXPORTED} or

     *      Android T, either {@link #RECEIVER_EXPORTED} or

     *      {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being

     *      registered for protected broadcasts

     *
@@ -3210,7 +3210,7 @@ public abstract class Context { 
     * @param scheduler Handler identifying the thread that will receive

     *      the Intent.  If null, the main thread of the process will be used.

     * @param flags Additional options for the receiver. As of

     *      {@link android.os.Build.VERSION_CODES#TIRAMISU}, either {@link #RECEIVER_EXPORTED} or

     *      Android T, either {@link #RECEIVER_EXPORTED} or

     *      {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being

     *      registered for protected broadcasts

     *