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

Merge "IFACE_IP_MODE_*: add IntDef and clean up JavaDocs"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-27 17:13:36 +00:00
committed by Android (Google) Code Review
parent 3bade98359 478c8aa0ac
commit cb5a64ff40
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -634,10 +634,19 @@ public class WifiManager {
*/
public static final int SAP_START_FAILURE_NO_CHANNEL = 1;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"IFACE_IP_MODE_"}, value = {
IFACE_IP_MODE_UNSPECIFIED,
IFACE_IP_MODE_CONFIGURATION_ERROR,
IFACE_IP_MODE_TETHERED,
IFACE_IP_MODE_LOCAL_ONLY})
public @interface IfaceIpMode {}
/**
* Interface IP mode unspecified.
*
* @see updateInterfaceIpState(String, int)
* @see #updateInterfaceIpState(String, int)
*
* @hide
*/
@@ -646,7 +655,7 @@ public class WifiManager {
/**
* Interface IP mode for configuration error.
*
* @see updateInterfaceIpState(String, int)
* @see #updateInterfaceIpState(String, int)
*
* @hide
*/
@@ -655,7 +664,7 @@ public class WifiManager {
/**
* Interface IP mode for tethering.
*
* @see updateInterfaceIpState(String, int)
* @see #updateInterfaceIpState(String, int)
*
* @hide
*/
@@ -664,7 +673,7 @@ public class WifiManager {
/**
* Interface IP mode for Local Only Hotspot.
*
* @see updateInterfaceIpState(String, int)
* @see #updateInterfaceIpState(String, int)
*
* @hide
*/
@@ -2670,9 +2679,9 @@ public class WifiManager {
/**
* Call allowing ConnectivityService to update WifiService with interface mode changes.
*
* The possible modes include: {@link IFACE_IP_MODE_TETHERED},
* {@link IFACE_IP_MODE_LOCAL_ONLY},
* {@link IFACE_IP_MODE_CONFIGURATION_ERROR}
* The possible modes include: {@link #IFACE_IP_MODE_TETHERED},
* {@link #IFACE_IP_MODE_LOCAL_ONLY},
* {@link #IFACE_IP_MODE_CONFIGURATION_ERROR}
*
* @param ifaceName String name of the updated interface
* @param mode int representing the new mode