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

Commit 033a4ae0 authored by Oscar Shu's avatar Oscar Shu Committed by Android (Google) Code Review
Browse files

Merge "Add permission MANAGE_WIFI_AUTOJOIN"

parents 9c2969c7 7ac1d74d

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,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_AUTO_JOIN = "android.permission.MANAGE_WIFI_AUTO_JOIN";

    field public static final String MANAGE_WIFI_COUNTRY_CODE = "android.permission.MANAGE_WIFI_COUNTRY_CODE";

    field public static final String MARK_DEVICE_ORGANIZATION_OWNED = "android.permission.MARK_DEVICE_ORGANIZATION_OWNED";

    field public static final String MODIFY_APPWIDGET_BIND_PERMISSIONS = "android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS";

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -1788,6 +1788,13 @@ 
        android:label="@string/permlab_changeWifiState"

        android:protectionLevel="normal" />



    <!-- @SystemApi @hide Allows applications to enable/disable wifi auto join. This permission

         is used to let OEMs grant their trusted app access to a subset of privileged wifi APIs

         to improve wifi performance.

         <p>Not for use by third-party applications. -->

    <permission android:name="android.permission.MANAGE_WIFI_AUTO_JOIN"

                android:protectionLevel="signature|privileged" />



    <!-- @SystemApi @hide Allows apps to create and manage IPsec tunnels.

         <p>Only granted to applications that are currently bound by the

         system for creating and managing IPsec-based interfaces.