Merge "Merge "documentation fixes" into nyc-mr1-dev am: 14826e5489 am:... (ff93a475) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiConfiguration.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -228,9 +228,9 @@ public class WifiConfiguration implements Parcelable {
		*/
		public int networkId;

		// Fixme We need remove this field to use only Quality network selection status only
		/**
		* The current status of this network configuration entry.
		* Fixme We need remove this field to use only Quality network selection status only
		* @see Status
		*/
		public int status;
		@@ -238,7 +238,7 @@ public class WifiConfiguration implements Parcelable {
		/**
		* The network's SSID. Can either be an ASCII string,
		* which must be enclosed in double quotation marks
		* (e.g., {@code "MyNetwork"}, or a string of
		* (e.g., {@code "MyNetwork"}), or a string of
		* hex digits, which are not enclosed in quotes
		* (e.g., {@code 01a243f405}).
		*/
		@@ -290,9 +290,10 @@ public class WifiConfiguration implements Parcelable {
		* string otherwise.
		*/
		public String preSharedKey;

		/**
		* Up to four WEP keys. Either an ASCII string enclosed in double
		* quotation marks (e.g., {@code "abcdef"} or a string
		* quotation marks (e.g., {@code "abcdef"}) or a string
		* of hex digits (e.g., {@code 0102030405}).
		* <p/>
		* When the value of one of these keys is read, the actual key is