Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Id6878f9cd849ec9ce6b2c582f5a640ef185774cf
This commit is contained in:
Treehugger Robot
2021-10-05 23:21:57 +00:00
committed by Automerger Merge Worker
parent 8768ec0e95 407c8c4fc5
commit 5476b13b48
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/Context.java
View File

@@ -3002,7 +3002,7 @@ public abstract class Context {
* @param receiver The BroadcastReceiver to handle the broadcast. * @param receiver The BroadcastReceiver to handle the broadcast.
* @param filter Selects the Intent broadcasts to be received. * @param filter Selects the Intent broadcasts to be received.
* @param flags Additional options for the receiver. As of * @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 * {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being registered
* for protected broadcasts, and may additionally specify * for protected broadcasts, and may additionally specify
* {@link #RECEIVER_VISIBLE_TO_INSTANT_APPS} if {@link #RECEIVER_EXPORTED} is * {@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 * @param scheduler Handler identifying the thread that will receive
* the Intent. If null, the main thread of the process will be used. * the Intent. If null, the main thread of the process will be used.
* @param flags Additional options for the receiver. As of * @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 * {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being registered
* for protected broadcasts, and may additionally specify * for protected broadcasts, and may additionally specify
* {@link #RECEIVER_VISIBLE_TO_INSTANT_APPS} if {@link #RECEIVER_EXPORTED} is * {@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 * @param scheduler Handler identifying the thread that will receive
* the Intent. If {@code null}, the main thread of the process will be used. * the Intent. If {@code null}, the main thread of the process will be used.
* @param flags Additional options for the receiver. As of * @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 * {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being
* registered for protected broadcasts * registered for protected broadcasts
* *
@@ -3210,7 +3210,7 @@ public abstract class Context {
* @param scheduler Handler identifying the thread that will receive * @param scheduler Handler identifying the thread that will receive
* the Intent. If null, the main thread of the process will be used. * the Intent. If null, the main thread of the process will be used.
* @param flags Additional options for the receiver. As of * @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 * {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being
* registered for protected broadcasts * registered for protected broadcasts
* *