summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-23 09:11:37 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-08-23 09:11:37 +0000
commita0ec1987d8cbf26ea3ac320afb1c214aa5dc20c8 (patch)
tree59bd40b7c61d2848e24398f957595abcd874807b
parent1a7824743b5804ecea8e3b9ba05c695aadd690a1 (diff)
parent70642ea6c33b523260a91d151f6c743c11645a77 (diff)
Merge "Adds android.permission.REGISTER_NSD_OFFLOAD_ENGINE" into main
-rw-r--r--core/api/system-current.txt1
-rw-r--r--core/res/AndroidManifest.xml8
2 files changed, 9 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index c893b5432269..26c72f00a4ba 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -276,6 +276,7 @@ package android {
field public static final String RECOVER_KEYSTORE = "android.permission.RECOVER_KEYSTORE";
field public static final String REGISTER_CALL_PROVIDER = "android.permission.REGISTER_CALL_PROVIDER";
field public static final String REGISTER_CONNECTION_MANAGER = "android.permission.REGISTER_CONNECTION_MANAGER";
+ field public static final String REGISTER_NSD_OFFLOAD_ENGINE = "android.permission.REGISTER_NSD_OFFLOAD_ENGINE";
field public static final String REGISTER_SIM_SUBSCRIPTION = "android.permission.REGISTER_SIM_SUBSCRIPTION";
field public static final String REGISTER_STATS_PULL_ATOM = "android.permission.REGISTER_STATS_PULL_ATOM";
field public static final String REMOTE_DISPLAY_PROVIDER = "android.permission.REMOTE_DISPLAY_PROVIDER";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index c226112898a9..c369a10f4e23 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2225,6 +2225,14 @@
<permission android:name="android.permission.MANAGE_ETHERNET_NETWORKS"
android:protectionLevel="signature" />
+ <!-- Allows system apps to call methods to register itself as a mDNS offload engine.
+ <p>Not for use by third-party or privileged applications.
+ @SystemApi
+ @hide This should only be used by system apps.
+ -->
+ <permission android:name="android.permission.REGISTER_NSD_OFFLOAD_ENGINE"
+ android:protectionLevel="signature" />
+
<!-- ======================================= -->
<!-- Permissions for short range, peripheral networks -->
<!-- ======================================= -->