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

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

Merge "Make WifiManager.ACTION_WIFI_SCAN_AVAILABLE public"

parents 859249ae 04d6cf41

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -30627,6 +30627,7 @@ package android.net.wifi { 
    field public static final String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";

    field public static final String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";

    field public static final String ACTION_WIFI_NETWORK_SUGGESTION_POST_CONNECTION = "android.net.wifi.action.WIFI_NETWORK_SUGGESTION_POST_CONNECTION";

    field public static final String ACTION_WIFI_SCAN_AVAILABLE = "android.net.wifi.action.WIFI_SCAN_AVAILABLE";

    field @Deprecated public static final int ERROR_AUTHENTICATING = 1; // 0x1

    field @Deprecated public static final String EXTRA_BSSID = "bssid";

    field public static final String EXTRA_NETWORK_INFO = "networkInfo";
@@ -30635,6 +30636,7 @@ package android.net.wifi { 
    field @Deprecated public static final String EXTRA_NEW_STATE = "newState";

    field public static final String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";

    field public static final String EXTRA_RESULTS_UPDATED = "resultsUpdated";

    field public static final String EXTRA_SCAN_AVAILABLE = "android.net.wifi.extra.SCAN_AVAILABLE";

    field @Deprecated public static final String EXTRA_SUPPLICANT_CONNECTED = "connected";

    field @Deprecated public static final String EXTRA_SUPPLICANT_ERROR = "supplicantError";

    field @Deprecated public static final String EXTRA_WIFI_INFO = "wifiInfo";

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

+10 −6
Original line number Diff line number Diff line
@@ -233,16 +233,20 @@ public class WifiManager { 
    public @interface SuggestionConnectionStatusCode {}



    /**

     * Broadcast intent action indicating whether Wi-Fi scanning is allowed currently

     * @hide

     * Broadcast intent action indicating whether Wi-Fi scanning is currently available.

     * Available extras:

     * - {@link #EXTRA_SCAN_AVAILABLE}

     */

    public static final String WIFI_SCAN_AVAILABLE = "wifi_scan_available";

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_WIFI_SCAN_AVAILABLE =

            "android.net.wifi.action.WIFI_SCAN_AVAILABLE";



    /**

     * Extra int indicating scan availability, WIFI_STATE_ENABLED and WIFI_STATE_DISABLED

     * @hide

     * A boolean extra indicating whether scanning is currently available.

     * Sent in the broadcast {@link #ACTION_WIFI_SCAN_AVAILABLE}.

     * Its value is true if scanning is currently available, false otherwise.

     */

    public static final String EXTRA_SCAN_AVAILABLE = "scan_enabled";

    public static final String EXTRA_SCAN_AVAILABLE = "android.net.wifi.extra.SCAN_AVAILABLE";



    /**

     * Broadcast intent action indicating that the credential of a Wi-Fi network