Merge "IFACE_IP_MODE_*: add IntDef and clean up JavaDocs" (cb5a64ff) · Commits · e / os / android_frameworks_base

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

+16 −7

Original line number	Original line	Diff line number	Diff line
	@@ -634,10 +634,19 @@ public class WifiManager {
	*/		*/
	public static final int SAP_START_FAILURE_NO_CHANNEL = 1;		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.		* Interface IP mode unspecified.
	*		*
	* @see updateInterfaceIpState(String, int)		* @see #updateInterfaceIpState(String, int)
	*		*
	* @hide		* @hide
	*/		*/
	@@ -646,7 +655,7 @@ public class WifiManager {
	/**		/**
	* Interface IP mode for configuration error.		* Interface IP mode for configuration error.
	*		*
	* @see updateInterfaceIpState(String, int)		* @see #updateInterfaceIpState(String, int)
	*		*
	* @hide		* @hide
	*/		*/
	@@ -655,7 +664,7 @@ public class WifiManager {
	/**		/**
	* Interface IP mode for tethering.		* Interface IP mode for tethering.
	*		*
	* @see updateInterfaceIpState(String, int)		* @see #updateInterfaceIpState(String, int)
	*		*
	* @hide		* @hide
	*/		*/
	@@ -664,7 +673,7 @@ public class WifiManager {
	/**		/**
	* Interface IP mode for Local Only Hotspot.		* Interface IP mode for Local Only Hotspot.
	*		*
	* @see updateInterfaceIpState(String, int)		* @see #updateInterfaceIpState(String, int)
	*		*
	* @hide		* @hide
	*/		*/
	@@ -2670,9 +2679,9 @@ public class WifiManager {
	/**		/**
	* Call allowing ConnectivityService to update WifiService with interface mode changes.		* Call allowing ConnectivityService to update WifiService with interface mode changes.
	*		*
	* The possible modes include: {@link IFACE_IP_MODE_TETHERED},		* The possible modes include: {@link #IFACE_IP_MODE_TETHERED},
	* {@link IFACE_IP_MODE_LOCAL_ONLY},		* {@link #IFACE_IP_MODE_LOCAL_ONLY},
	* {@link IFACE_IP_MODE_CONFIGURATION_ERROR}		* {@link #IFACE_IP_MODE_CONFIGURATION_ERROR}
	*		*
	* @param ifaceName String name of the updated interface		* @param ifaceName String name of the updated interface
	* @param mode int representing the new mode		* @param mode int representing the new mode