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

Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6

Browse Source 
am: f95a3703c1

Change-Id: Ic271ac809add1ac66b468ee337f2838e2a008cdc
This commit is contained in:
Etan Cohen
2016-09-26 16:53:04 +00:00
committed by android-build-merger
parent 2cad9a8e69 f95a3703c1
commit c83ae8d290
1 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
wifi/java/android/net/wifi/nan/WifiNanManager.java
View File

@@ -197,43 +197,15 @@ public class WifiNanManager {
public static final String NETWORK_SPECIFIER_KEY_TOKEN = "token"; public static final String NETWORK_SPECIFIER_KEY_TOKEN = "token";
/** /**
* Broadcast intent action to indicate whether Wi-Fi NAN is enabled or * Broadcast intent action to indicate that the state of Wi-Fi NAN availability has changed.
* disabled. An extra {@link #EXTRA_WIFI_STATE} provides the state * Use the {@link #isAvailable()} to query the current status.
* information as int using {@link #WIFI_NAN_STATE_DISABLED} and * This broadcast is <b>not</b> sticky, use the {@link #isAvailable()} API after registering
* {@link #WIFI_NAN_STATE_ENABLED} constants. This broadcast is <b>not</b> sticky, * the broadcast to check the current state of Wi-Fi NAN.
* use the {@link #isAvailable()} API after registering the broadcast to check the current
* state of Wi-Fi NAN.
*
* @see #EXTRA_WIFI_STATE
*/ */
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_WIFI_NAN_STATE_CHANGED = public static final String ACTION_WIFI_NAN_STATE_CHANGED =
"android.net.wifi.nan.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 */ /** @hide */
@IntDef({ @IntDef({
WIFI_NAN_DATA_PATH_ROLE_INITIATOR, WIFI_NAN_DATA_PATH_ROLE_RESPONDER}) WIFI_NAN_DATA_PATH_ROLE_INITIATOR, WIFI_NAN_DATA_PATH_ROLE_RESPONDER})