Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WiFi: Define permissions for set/clear country code API" am: bb57bf925a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb91cb3a25d9badbde16825742615c23c4fa9888
This commit is contained in:
Sunil Ravi
2021-03-03 22:41:05 +00:00
committed by Automerger Merge Worker
parent 065dbb1c6b bb57bf925a
commit 3cbc44875c
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -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";

5
core/res/AndroidManifest.xml
View File

@@ -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. -->