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

Commit 6c1ccd17 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "LINK_CONFIGURATION_CHANGED broadcast: stop including EXTRA_LINK_PROPERTIES"

parents 94007264 c8a57301

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7428,7 +7428,7 @@ package android.net.wifi { 
    field public static final int EASY_CONNECT_NETWORK_ROLE_AP = 1; // 0x1

    field public static final int EASY_CONNECT_NETWORK_ROLE_STA = 0; // 0x0

    field public static final String EXTRA_CHANGE_REASON = "changeReason";

    field public static final String EXTRA_LINK_PROPERTIES = "android.net.wifi.extra.LINK_PROPERTIES";

    field @Deprecated public static final String EXTRA_LINK_PROPERTIES = "android.net.wifi.extra.LINK_PROPERTIES";

    field public static final String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";

    field public static final String EXTRA_OSU_NETWORK = "android.net.wifi.extra.OSU_NETWORK";

    field public static final String EXTRA_PREVIOUS_WIFI_AP_STATE = "previous_wifi_state";

wifi/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ package android.net.wifi { 
    field public static final int EASY_CONNECT_NETWORK_ROLE_AP = 1; // 0x1

    field public static final int EASY_CONNECT_NETWORK_ROLE_STA = 0; // 0x0

    field public static final String EXTRA_CHANGE_REASON = "changeReason";

    field public static final String EXTRA_LINK_PROPERTIES = "android.net.wifi.extra.LINK_PROPERTIES";

    field @Deprecated public static final String EXTRA_LINK_PROPERTIES = "android.net.wifi.extra.LINK_PROPERTIES";

    field public static final String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";

    field public static final String EXTRA_OSU_NETWORK = "android.net.wifi.extra.OSU_NETWORK";

    field public static final String EXTRA_PREVIOUS_WIFI_AP_STATE = "previous_wifi_state";

wifi/java/android/net/wifi/WifiManager.java

+4 −3
Original line number Diff line number Diff line
@@ -1053,9 +1053,6 @@ public class WifiManager { 


    /**

     * Broadcast intent action indicating that the link configuration changed on wifi.

     * <br />Included Extras:

     * <br />{@link #EXTRA_LINK_PROPERTIES}: {@link android.net.LinkProperties} object associated

     * with the Wi-Fi network.

     * <br /> No permissions are required to listen to this broadcast.

     * @hide

     */
@@ -1071,8 +1068,12 @@ public class WifiManager { 
     * Included in the {@link #ACTION_LINK_CONFIGURATION_CHANGED} broadcast.

     *

     * Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.

     *

     * @deprecated this extra is no longer populated.

     *

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final String EXTRA_LINK_PROPERTIES = "android.net.wifi.extra.LINK_PROPERTIES";