diff options
| author | James Mattis <jmattis@google.com> | 2021-02-13 21:14:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-13 21:14:48 +0000 |
| commit | d11f866ee61033d574dc4e01139a0dc86054896f (patch) | |
| tree | 73c4b43dc879fae435973b1b761d0a580177169f /core/res | |
| parent | a9f241bb437bfc4542a4ee3a5da65014eb5b510c (diff) | |
| parent | 601d16a336db896e5bc91b8538ceb1065848d17a (diff) | |
Merge changes from topics "pans", "pans-permission" am: 601d16a336
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72035b6d5d6504cece1df472ae317e865ceb7882
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 --> <!-- ======================================= --> |