summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorPaul Hu <paulhu@google.com>2020-11-18 09:28:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-18 09:28:18 +0000
commitb12dfe489f2bb810595a0f0d0fbd58a51991cb81 (patch)
treed12527cd810ab36b2e9a30a0aad6f43899590da6 /core/java
parent00f3d0f52b4b16eac2685a45dcd24f0290b37fca (diff)
parentcb9a7b819c8966eb0a3945d2aac1a660b8772a20 (diff)
Merge "Expose BroadcastOptions#setMaxManifestReceiverApiLevel as system API" am: c5ec644861 am: cb9a7b819c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466224 Change-Id: Ifba72e9bd6cb8551d825898e2ffc8ad34bf238b3
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/BroadcastOptions.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/BroadcastOptions.java b/core/java/android/app/BroadcastOptions.java
index 3789a44e1d55..03dca30f8560 100644
--- a/core/java/android/app/BroadcastOptions.java
+++ b/core/java/android/app/BroadcastOptions.java
@@ -127,6 +127,7 @@ public class BroadcastOptions {
* them. This only applies to receivers declared in the app's AndroidManifest.xml.
* @hide
*/
+ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public void setMaxManifestReceiverApiLevel(int apiLevel) {
mMaxManifestReceiverApiLevel = apiLevel;
}
@@ -135,6 +136,7 @@ public class BroadcastOptions {
* Return {@link #setMaxManifestReceiverApiLevel}.
* @hide
*/
+ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public int getMaxManifestReceiverApiLevel() {
return mMaxManifestReceiverApiLevel;
}