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

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

Merge "Remove MANAGE_WIFI_AUTO_JOIN" into tm-dev

parents 6782f931 ef076534

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ package android { 
    field public static final String MANAGE_MEDIA = "android.permission.MANAGE_MEDIA";

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

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

    field @Deprecated public static final String MANAGE_WIFI_AUTO_JOIN = "android.permission.MANAGE_WIFI_AUTO_JOIN";

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

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

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

core/res/AndroidManifest.xml

+0 −9
Original line number Diff line number Diff line
@@ -1993,15 +1993,6 @@ 
        android:label="@string/permlab_changeWifiState"

        android:protectionLevel="normal" />



    <!-- 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.

         @deprecated will be replaced with MANAGE_WIFI_NETWORK_SELECTION -->

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

                android:protectionLevel="signature|privileged|knownSigner"

                android:knownCerts="@array/wifi_known_signers" />



    <!-- This permission is used to let OEMs grant their trusted app access to a subset of

         privileged wifi APIs to improve wifi performance. Allows applications to manage

         Wi-Fi network selection related features such as enable or disable global auto-join,