diff options
| author | 2021-03-03 23:42:13 +0000 | |
|---|---|---|
| committer | 2021-03-03 23:42:13 +0000 | |
| commit | dfe2cc04ac29d580f2641f3a9951cecd54013ffc (patch) | |
| tree | 8323e699e1a1132915ff37623236210245a3bc41 | |
| parent | 49ceda904aca3826c11a951fc8c894688ba307c3 (diff) | |
| parent | 3cbc44875c3ca02b5ffd78a70b556fa0d34ce722 (diff) | |
Merge "WiFi: Define permissions for set/clear country code API" am: bb57bf925a am: 3cbc44875c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6009e225728fa77d3a115dd5f8f415d606a56d60
| -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 d9629af51da0..a31149a48b00 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1801,6 +1801,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. --> |