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

Commit 2741811e authored by xshu's avatar xshu
Browse files

Make wifi permissions public 

MANAGE_WIFI_AUTO_JOIN and OVERRIDE_WIFI_CONFIG will be needed by OEM
apps that will be installed via the playstore, built against the
standard SDK.

Bug: 218611912
Test: compile
Change-Id: I2d188c0b098f9c6f79d09334e47fcf0dfbcf452d
parent c4837b13

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 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 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";
@@ -121,6 +122,7 @@ package android { 
    field public static final String NFC = "android.permission.NFC";

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

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

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

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

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

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

core/api/system-current.txt

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

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

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

    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";
@@ -226,7 +225,6 @@ package android { 
    field public static final String OBSERVE_SENSOR_PRIVACY = "android.permission.OBSERVE_SENSOR_PRIVACY";

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

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

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

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

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

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

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -1839,7 +1839,7 @@ 
        android:label="@string/permlab_changeWifiState"

        android:protectionLevel="normal" />



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

    <!-- 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. -->
@@ -1877,7 +1877,7 @@ 
    <permission android:name="android.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi @hide Allows an application to modify any wifi configuration, even if created

    <!-- Allows an application to modify any wifi configuration, even if created

     by another application. Once reconfigured the original creator cannot make any further

     modifications.

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