Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe2cc04 authored by Sunil Ravi's avatar Sunil Ravi Committed by Automerger Merge Worker
Browse files

Merge "WiFi: Define permissions for set/clear country code API" am: bb57bf92 am: 3cbc4487 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6009e225728fa77d3a115dd5f8f415d606a56d60
parents 49ceda90 3cbc4487

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -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. -->