diff options
| author | 2021-03-05 01:17:45 +0000 | |
|---|---|---|
| committer | 2021-03-05 01:17:45 +0000 | |
| commit | 876c8803f235986e0943cfa2127b1fe71be309e8 (patch) | |
| tree | 88f962a416a0e94d76f371fa0d5477af07e3b246 | |
| parent | b6ada90dad6daed20c716ddd67175b98ce5e9ab9 (diff) | |
| parent | 9c83a2b64a1861718375b071e713f3c72adbff2d (diff) | |
Merge "Add permission role SYSTEM_WIFI_COEX_MANAGER" into sc-dev
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index f01724316c5f..b4f3698861f0 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -358,6 +358,7 @@ package android { field public static final int config_systemGallery = 17039399; // 0x1040027 field public static final int config_systemShell = 17039402; // 0x104002a field public static final int config_systemSpeechRecognizer = 17039406; // 0x104002e + field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f } public static final class R.style { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 50d1e6bb0b18..072bb8799e59 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1876,15 +1876,15 @@ <permission android:name="android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE" android:protectionLevel="signature|privileged" /> - <!-- @SystemApi @hide Allows system APK to update Wifi/Cellular coex channels to avoid. + <!-- @SystemApi @hide Allows applications to update Wifi/Cellular coex channels to avoid. <p>Not for use by third-party applications. --> <permission android:name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" - android:protectionLevel="signature" /> + android:protectionLevel="signature|role" /> <!-- @SystemApi @hide Allows applications to access Wifi/Cellular coex channels being avoided. <p>Not for use by third-party applications. --> <permission android:name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" - android:protectionLevel="signature|privileged" /> + android:protectionLevel="signature|role" /> <!-- @SystemApi @hide Allows system APK to manage country code. <p>Not for use by third-party applications. --> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d61d19a41266..633e2161b5ee 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1964,6 +1964,8 @@ <string name="config_systemContacts" translatable="false">com.android.contacts</string> <!-- The name of the package that will hold the speech recognizer role by default. --> <string name="config_systemSpeechRecognizer" translatable="false"></string> + <!-- The name of the package that will hold the system Wi-Fi coex manager role. --> + <string name="config_systemWifiCoexManager" translateable="false"></string> <!-- The name of the package that will be allowed to change its components' label/icon. --> <string name="config_overrideComponentUiPackage" translatable="false"></string> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 2004d0a8d15c..9bc92e14de53 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3168,6 +3168,8 @@ <public name="config_customMediaSessionPolicyProvider" /> <!-- @hide @SystemApi --> <public name="config_systemSpeechRecognizer" /> + <!-- @hide @SystemApi --> + <public name="config_systemWifiCoexManager" /> </public-group> <public-group type="id" first-id="0x01020055"> |