diff options
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | wifi/api/system-current.txt | 4 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index a05849628ba7..949a54a781db 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7429,7 +7429,7 @@ package android.net.wifi { field public static final int EASY_CONNECT_NETWORK_ROLE_STA = 0; // 0x0 field public static final String EXTRA_CHANGE_REASON = "changeReason"; 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 @Deprecated 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"; field public static final String EXTRA_URL = "android.net.wifi.extra.URL"; @@ -7437,7 +7437,7 @@ package android.net.wifi { field public static final String EXTRA_WIFI_AP_INTERFACE_NAME = "android.net.wifi.extra.WIFI_AP_INTERFACE_NAME"; field public static final String EXTRA_WIFI_AP_MODE = "android.net.wifi.extra.WIFI_AP_MODE"; field public static final String EXTRA_WIFI_AP_STATE = "wifi_state"; - field public static final String EXTRA_WIFI_CONFIGURATION = "wifiConfiguration"; + field @Deprecated public static final String EXTRA_WIFI_CONFIGURATION = "wifiConfiguration"; field public static final String EXTRA_WIFI_CREDENTIAL_EVENT_TYPE = "et"; field public static final String EXTRA_WIFI_CREDENTIAL_SSID = "ssid"; field public static final int IFACE_IP_MODE_CONFIGURATION_ERROR = 0; // 0x0 diff --git a/wifi/api/system-current.txt b/wifi/api/system-current.txt index fd45ebec80ef..0f71ab46dbaf 100644 --- a/wifi/api/system-current.txt +++ b/wifi/api/system-current.txt @@ -509,7 +509,7 @@ package android.net.wifi { field public static final int EASY_CONNECT_NETWORK_ROLE_STA = 0; // 0x0 field public static final String EXTRA_CHANGE_REASON = "changeReason"; 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 @Deprecated 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"; field public static final String EXTRA_URL = "android.net.wifi.extra.URL"; @@ -517,7 +517,7 @@ package android.net.wifi { field public static final String EXTRA_WIFI_AP_INTERFACE_NAME = "android.net.wifi.extra.WIFI_AP_INTERFACE_NAME"; field public static final String EXTRA_WIFI_AP_MODE = "android.net.wifi.extra.WIFI_AP_MODE"; field public static final String EXTRA_WIFI_AP_STATE = "wifi_state"; - field public static final String EXTRA_WIFI_CONFIGURATION = "wifiConfiguration"; + field @Deprecated public static final String EXTRA_WIFI_CONFIGURATION = "wifiConfiguration"; field public static final String EXTRA_WIFI_CREDENTIAL_EVENT_TYPE = "et"; field public static final String EXTRA_WIFI_CREDENTIAL_SSID = "ssid"; field public static final int IFACE_IP_MODE_CONFIGURATION_ERROR = 0; // 0x0 diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 2219bfcd6aab..b4e42108a15f 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -931,9 +931,6 @@ public class WifiManager { * This can be as a result of adding/updating/deleting a network. * <br /> * {@link #EXTRA_CHANGE_REASON} contains whether the configuration was added/changed/removed. - * {@link #EXTRA_WIFI_CONFIGURATION} is never set starting in Android 11. - * {@link #EXTRA_MULTIPLE_NETWORKS_CHANGED} is set for backwards compatibility reasons, but - * its value is always true, even if only a single network changed. * <br /> * The {@link android.Manifest.permission#ACCESS_WIFI_STATE ACCESS_WIFI_STATE} permission is * required to receive this broadcast. @@ -947,17 +944,20 @@ public class WifiManager { * The lookup key for a {@link android.net.wifi.WifiConfiguration} object representing * the changed Wi-Fi configuration when the {@link #CONFIGURED_NETWORKS_CHANGED_ACTION} * broadcast is sent. - * Note: this extra is never set starting in Android 11. + * @deprecated this extra is never set. Use {@link #getConfiguredNetworks} to get the full list + * of configured networks. * @hide */ + @Deprecated @SystemApi public static final String EXTRA_WIFI_CONFIGURATION = "wifiConfiguration"; /** * Multiple network configurations have changed. * @see #CONFIGURED_NETWORKS_CHANGED_ACTION - * Note: this extra is always true starting in Android 11. + * @deprecated this extra's value is always true. * @hide */ + @Deprecated @SystemApi public static final String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges"; /** |