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

Commit e0e919ef authored by David Su's avatar David Su Committed by Automerger Merge Worker
Browse files

Merge "CONFIGURED_NETWORKS_CHANGED_ACTION: update docs since we stop sending... 

Merge "CONFIGURED_NETWORKS_CHANGED_ACTION: update docs since we stop sending WifiConfiguration" into rvc-dev am: 151f172b am: 32f2fc81 am: 465cb393

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

Change-Id: I4c4b4c1985e741f73dbda99940e0c249d0dc00f7
parents 5d2ee704 465cb393

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

+16 −7
Original line number Diff line number Diff line
@@ -928,19 +928,26 @@ public class WifiManager { 


    /**

     * Broadcast intent action indicating that the configured networks changed.

     * This can be as a result of adding/updating/deleting a network. If

     * {@link #EXTRA_MULTIPLE_NETWORKS_CHANGED} is set to true the new configuration

     * can be retreived with the {@link #EXTRA_WIFI_CONFIGURATION} extra. If multiple

     * Wi-Fi configurations changed, {@link #EXTRA_WIFI_CONFIGURATION} will not be present.

     * 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.

     *

     * @hide

     */

    @SystemApi

    public static final String CONFIGURED_NETWORKS_CHANGED_ACTION =

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

     * broadcast is sent.

     * Note: this extra is never set starting in Android 11.

     * @hide

     */

    @SystemApi
@@ -948,14 +955,16 @@ public class WifiManager { 
    /**

     * Multiple network configurations have changed.

     * @see #CONFIGURED_NETWORKS_CHANGED_ACTION

     *

     * Note: this extra is always true starting in Android 11.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";

    /**

     * 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

     * @hide

     */