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

Commit 905077a5 authored by Etan Cohen's avatar Etan Cohen
Browse files

[NAN] Change Broadcast for NAN status change to notification only [DO NOT MERGE] 

Remove information about current status of NAN. Receiver will have
to query that information explicitly. New pattern (per API council
review) - helps reduce window for having old information.

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: Ie197e1be71ec04dfbf65cf29e64c0cd3fa7c5190
parent 4b47c3f5

wifi/java/android/net/wifi/nan/WifiNanManager.java

+4 −32
Original line number Diff line number Diff line
@@ -197,43 +197,15 @@ public class WifiNanManager { 
    public static final String NETWORK_SPECIFIER_KEY_TOKEN = "token";



    /**

     * Broadcast intent action to indicate whether Wi-Fi NAN is enabled or

     * disabled. An extra {@link #EXTRA_WIFI_STATE} provides the state

     * information as int using {@link #WIFI_NAN_STATE_DISABLED} and

     * {@link #WIFI_NAN_STATE_ENABLED} constants. This broadcast is <b>not</b> sticky,

     * use the {@link #isAvailable()} API after registering the broadcast to check the current

     * state of Wi-Fi NAN.

     *

     * @see #EXTRA_WIFI_STATE

     * Broadcast intent action to indicate that the state of Wi-Fi NAN availability has changed.

     * Use the {@link #isAvailable()} to query the current status.

     * This broadcast is <b>not</b> sticky, use the {@link #isAvailable()} API after registering

     * the broadcast to check the current state of Wi-Fi NAN.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_WIFI_NAN_STATE_CHANGED =

            "android.net.wifi.nan.action.WIFI_NAN_STATE_CHANGED";



    /**

     * The lookup key for an int value indicating whether Wi-Fi NAN is enabled or

     * disabled. Retrieve it with

     * {@link android.content.Intent#getIntExtra(String,int)}.

     *

     * @see #WIFI_NAN_STATE_DISABLED

     * @see #WIFI_NAN_STATE_ENABLED

     */

    public static final String EXTRA_WIFI_STATE = "android.net.wifi.nan.extra.WIFI_STATE";



    /**

     * Wi-Fi NAN is disabled.

     *

     * @see #ACTION_WIFI_NAN_STATE_CHANGED

     */

    public static final int WIFI_NAN_STATE_DISABLED = 1;



    /**

     * Wi-Fi NAN is enabled.

     *

     * @see #ACTION_WIFI_NAN_STATE_CHANGED

     */

    public static final int WIFI_NAN_STATE_ENABLED = 2;



    /** @hide */

    @IntDef({

            WIFI_NAN_DATA_PATH_ROLE_INITIATOR, WIFI_NAN_DATA_PATH_ROLE_RESPONDER})