diff options
| author | 2023-08-23 11:37:06 +0000 | |
|---|---|---|
| committer | 2023-08-23 11:37:06 +0000 | |
| commit | 322cab14074d84c8d76a141036951a2ab2df5dca (patch) | |
| tree | a216cd3fac8f1827982a1e562add08fcf3c08b04 | |
| parent | ee82fb1f18677a9df65f29494ab02d3d4c1bae84 (diff) | |
| parent | 41c590bf2dc4ced03a41c7f1ef552d09db384e1e (diff) | |
Merge "Adds android.permission.REGISTER_NSD_OFFLOAD_ENGINE" into main am: a0ec1987d8 am: 46fdc734de am: 41c590bf2d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2696913
Change-Id: I7be909b37187b1eb019eba49401f7ff53f985959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 141eb9652272..cf319c425bfe 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -298,6 +298,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 c14b730eb18b..7d9d99113663 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2268,6 +2268,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 --> <!-- ======================================= --> |