diff options
| author | Sunil Ravi <sunilravi@google.com> | 2021-03-03 21:50:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-03 21:50:21 +0000 |
| commit | bb57bf925ab366774736cf0c8002bfcc3a1d678d (patch) | |
| tree | 49d6bb24aef416d7cbf6ae679e33be9cea09b0a2 | |
| parent | 1af6a12e98c9b2c5317b35ebe2d8c8d269e98dce (diff) | |
| parent | 063cf92aa863c7691ee3d03250f79b7d99225a9b (diff) | |
Merge "WiFi: Define permissions for set/clear country code API"
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 35ce520e28a8..fd6d5a5c0520 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -134,6 +134,7 @@ package android { field public static final String MANAGE_USB = "android.permission.MANAGE_USB"; field public static final String MANAGE_USERS = "android.permission.MANAGE_USERS"; field public static final String MANAGE_USER_OEM_UNLOCK_STATE = "android.permission.MANAGE_USER_OEM_UNLOCK_STATE"; + field public static final String MANAGE_WIFI_COUNTRY_CODE = "android.permission.MANAGE_WIFI_COUNTRY_CODE"; field public static final String MODIFY_APPWIDGET_BIND_PERMISSIONS = "android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"; field public static final String MODIFY_AUDIO_ROUTING = "android.permission.MODIFY_AUDIO_ROUTING"; field public static final String MODIFY_CELL_BROADCASTS = "android.permission.MODIFY_CELL_BROADCASTS"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 298a6c5005e1..9302b693704c 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1795,6 +1795,11 @@ <permission android:name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" android:protectionLevel="signature|privileged" /> + <!-- @SystemApi @hide Allows system APK to manage country code. + <p>Not for use by third-party applications. --> + <permission android:name="android.permission.MANAGE_WIFI_COUNTRY_CODE" + android:protectionLevel="signature" /> + <!-- @SystemApi @hide Allows an application to manage an automotive device's application network preference as it relates to OEM_PAID and OEM_PRIVATE capable networks. <p>Not for use by third-party or privileged applications. --> |