diff options
| author | 2023-11-22 08:48:30 +0000 | |
|---|---|---|
| committer | 2023-11-22 08:48:30 +0000 | |
| commit | d2562f3f2f54ce1df6ecbd774ac5d2c10df40761 (patch) | |
| tree | a73c8427bf19d774aacb2a7f527397f785d063be | |
| parent | 362389285bedb454355d9006537a3a408ae34094 (diff) | |
| parent | c77885c46105b918efb9475d11beb8abb8dd1e79 (diff) | |
Merge "Add feature flag for REGISTER_NSD_OFFLOAD_ENGINE permission" into main am: 701dd4afdb am: 3d3e54aae7 am: c77885c461
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2831371
Change-Id: I97eb6c420ec58f0787b2b71acd9c26be0e2eee6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 275fe7790e84..c282e4b6f3eb 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -307,7 +307,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 @FlaggedApi("com.android.net.flags.register_nsd_offload_engine") 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 7b075e6f4872..4d208c6ed30a 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2301,6 +2301,7 @@ <!-- 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 + @FlaggedApi("com.android.net.flags.register_nsd_offload_engine") @hide This should only be used by system apps. --> <permission android:name="android.permission.REGISTER_NSD_OFFLOAD_ENGINE" |