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

Commit 491d6707 authored by Oscar Shu's avatar Oscar Shu Committed by Automerger Merge Worker
Browse files

Merge "Rename MANAGE_WIFI_AUTO_JOIN to MANAGE_WIFI_NETWORK_SELECTION" into tm-dev am: 62ca047a 

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

Change-Id: Iba01f4e6b328054b9c37b685cb521b50360db31a
parents 744b8a7a 62ca047a

core/api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -113,8 +113,9 @@ 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 public static final String MANAGE_WIFI_AUTO_JOIN = "android.permission.MANAGE_WIFI_AUTO_JOIN";

    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";

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

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

core/res/AndroidManifest.xml

+11 −1
Original line number Diff line number Diff line
@@ -1901,11 +1901,21 @@ 
    <!-- 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. -->

         <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,

         modify connectivity scan intervals, and approve Wi-Fi Direct connections.

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

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

                android:protectionLevel="signature|privileged|knownSigner"

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



    <!-- Allows applications to get notified when a Wi-Fi interface request cannot

         be satisfied without tearing down one or more other interfaces, and provide a decision

         whether to approve the request or reject it.