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

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

Merge "Rename WifiManager.ACTION_WIFI_SCAN_AVAILABLE"

parents bbf8afe0 f842ef2f

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -31293,7 +31293,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 public static final String ACTION_WIFI_SCAN_AVAILABILITY_CHANGED = "android.net.wifi.action.WIFI_SCAN_AVAILABILITY_CHANGED";

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

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ 
    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_SUBSCRIPTION_REMEDIATION" />

    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_LAUNCH_OSU_VIEW" />

    <protected-broadcast android:name="android.net.wifi.action.WIFI_NETWORK_SUGGESTION_POST_CONNECTION" />

    <protected-broadcast android:name="android.net.wifi.action.WIFI_SCAN_AVAILABLE" />

    <protected-broadcast android:name="android.net.wifi.action.WIFI_SCAN_AVAILABILITY_CHANGED" />

    <protected-broadcast android:name="android.net.wifi.supplicant.CONNECTION_CHANGE" />

    <protected-broadcast android:name="android.net.wifi.supplicant.STATE_CHANGE" />

    <protected-broadcast android:name="android.net.wifi.p2p.STATE_CHANGED" />

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

+3 −3
Original line number Diff line number Diff line
@@ -257,12 +257,12 @@ public class WifiManager { 
     * - {@link #EXTRA_SCAN_AVAILABLE}

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_WIFI_SCAN_AVAILABLE =

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

    public static final String ACTION_WIFI_SCAN_AVAILABILITY_CHANGED =

            "android.net.wifi.action.WIFI_SCAN_AVAILABILITY_CHANGED";



    /**

     * A boolean extra indicating whether scanning is currently available.

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

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

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

     */

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

wifi/java/android/net/wifi/WifiScanner.java

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ public class WifiScanner { 
     *

     * @param enable set to true to enable scanning, set to false to disable all types of scanning.

     *

     * @see WifiManager#ACTION_WIFI_SCAN_AVAILABLE

     * @see WifiManager#ACTION_WIFI_SCAN_AVAILABILITY_CHANGED

     * {@hide}

     */

    @SystemApi