Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CONFIGURED_NETWORKS_CHANGED_ACTION: update docs since we stop sending WifiConfiguration" into rvc-dev am: 151f172b26

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

Change-Id: I2effee8f9d059bf7cd963dd0cd207176c609120c
This commit is contained in:
David Su
2020-06-23 03:20:16 +00:00
committed by Automerger Merge Worker
parent 62dd30fa67 151f172b26
commit 32f2fc81bf
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -928,19 +928,26 @@ public class WifiManager {
/** /**
* Broadcast intent action indicating that the configured networks changed. * Broadcast intent action indicating that the configured networks changed.
* This can be as a result of adding/updating/deleting a network. If * This can be as a result of adding/updating/deleting a network.
* {@link #EXTRA_MULTIPLE_NETWORKS_CHANGED} is set to true the new configuration * <br />
* can be retreived with the {@link #EXTRA_WIFI_CONFIGURATION} extra. If multiple * {@link #EXTRA_CHANGE_REASON} contains whether the configuration was added/changed/removed.
* Wi-Fi configurations changed, {@link #EXTRA_WIFI_CONFIGURATION} will not be present. * {@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.
*
* @hide * @hide
*/ */
@SystemApi @SystemApi
public static final String CONFIGURED_NETWORKS_CHANGED_ACTION = public static final String CONFIGURED_NETWORKS_CHANGED_ACTION =
"android.net.wifi.CONFIGURED_NETWORKS_CHANGE"; "android.net.wifi.CONFIGURED_NETWORKS_CHANGE";
/** /**
* The lookup key for a (@link android.net.wifi.WifiConfiguration} object representing * The lookup key for a {@link android.net.wifi.WifiConfiguration} object representing
* the changed Wi-Fi configuration when the {@link #CONFIGURED_NETWORKS_CHANGED_ACTION} * the changed Wi-Fi configuration when the {@link #CONFIGURED_NETWORKS_CHANGED_ACTION}
* broadcast is sent. * broadcast is sent.
* Note: this extra is never set starting in Android 11.
* @hide * @hide
*/ */
@SystemApi @SystemApi
@@ -948,14 +955,16 @@ public class WifiManager {
/** /**
* Multiple network configurations have changed. * Multiple network configurations have changed.
* @see #CONFIGURED_NETWORKS_CHANGED_ACTION * @see #CONFIGURED_NETWORKS_CHANGED_ACTION
* * Note: this extra is always true starting in Android 11.
* @hide * @hide
*/ */
@SystemApi @SystemApi
public static final String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges"; public static final String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";
/** /**
* The lookup key for an integer indicating the reason a Wi-Fi network configuration * The lookup key for an integer indicating the reason a Wi-Fi network configuration
* has changed. Only present if {@link #EXTRA_MULTIPLE_NETWORKS_CHANGED} is {@code false} * has changed. One of {@link #CHANGE_REASON_ADDED}, {@link #CHANGE_REASON_REMOVED},
* {@link #CHANGE_REASON_CONFIG_CHANGE}.
*
* @see #CONFIGURED_NETWORKS_CHANGED_ACTION * @see #CONFIGURED_NETWORKS_CHANGED_ACTION
* @hide * @hide
*/ */