diff options
| author | 2022-02-11 03:00:42 +0000 | |
|---|---|---|
| committer | 2022-02-11 03:00:42 +0000 | |
| commit | f08068fef6bb7097350c438af748b94cd86319ee (patch) | |
| tree | 221b7064a63543e9355e143c6546af0e725e31a0 | |
| parent | deb87aabd525aefada1e47b4cd39ea8207cdebee (diff) | |
| parent | 2738294d2ca744cbaa07e44f6ec9ab730f784cf1 (diff) | |
Merge "Add permission MANAGE_WIFI_INTERFACES"
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 2c085b4241e6..ccc12ff90128 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -112,6 +112,7 @@ package android { field public static final String MANAGE_ONGOING_CALLS = "android.permission.MANAGE_ONGOING_CALLS"; field public static final String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS"; field public static final String MANAGE_WIFI_AUTO_JOIN = "android.permission.MANAGE_WIFI_AUTO_JOIN"; + field public static final String MANAGE_WIFI_INTERFACES = "android.permission.MANAGE_WIFI_INTERFACES"; field public static final String MASTER_CLEAR = "android.permission.MASTER_CLEAR"; field public static final String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL"; field public static final String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 522a49bb3843..0c41f31becc9 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1905,6 +1905,13 @@ <permission android:name="android.permission.MANAGE_WIFI_AUTO_JOIN" android:protectionLevel="signature|privileged" /> + <!-- Allows applications to get notified when a Wi-Fi interface request cannot + be satisfied without tearing down one or more other interfaces, and provide a decision + whether to approve the request or reject it. + <p>Not for use by third-party applications. --> + <permission android:name="android.permission.MANAGE_WIFI_INTERFACES" + android:protectionLevel="signature|privileged" /> + <!-- @SystemApi @hide Allows apps to create and manage IPsec tunnels. <p>Only granted to applications that are currently bound by the system for creating and managing IPsec-based interfaces. |