diff options
| author | James Mattis <jmattis@google.com> | 2021-02-13 20:54:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-13 20:54:57 +0000 |
| commit | 601d16a336db896e5bc91b8538ceb1065848d17a (patch) | |
| tree | 647a4e08363712baac76c678601cc661c0ef0cfe /core/res | |
| parent | c9a8b2fa8e821b5fe706cdccbe73efd4fa4c0731 (diff) | |
| parent | 0846b40040255e5109a64cf91174368e5bfca1a7 (diff) | |
Merge changes from topics "pans", "pans-permission"
* changes:
Marking setOemNetworkPreference as @SystemApi
Adding permission for OEM managed preferences
Implementation of setOemNetworkPreference
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 43c87892c97b..24539b724f70 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1790,6 +1790,12 @@ <permission android:name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" android:protectionLevel="signature|privileged" /> + <!-- @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. --> + <permission android:name="android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE" + android:protectionLevel="signature" /> + <!-- ======================================= --> <!-- Permissions for short range, peripheral networks --> <!-- ======================================= --> |