AI 146222: Manual merge of 145980 from donutburger => master.
Automated import of CL 146222
diff --git a/api/3.xml b/api/3.xml
index 4d8f7a7..d646f4f 100644
--- a/api/3.xml
+++ b/api/3.xml
@@ -57915,7 +57915,7 @@
type="float"
transient="false"
volatile="false"
- value="0.0010f"
+ value="0.001f"
static="true"
final="true"
deprecated="not deprecated"
@@ -69483,16 +69483,6 @@
>
<implements name="android.os.Parcelable">
</implements>
-<constructor name="NetworkInfo"
- type="android.net.NetworkInfo"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="type" type="int">
-</parameter>
-</constructor>
<method name="describeContents"
return="int"
abstract="false"
@@ -69548,6 +69538,28 @@
visibility="public"
>
</method>
+<method name="getSubtype"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSubtypeName"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getType"
return="int"
abstract="false"
@@ -69614,6 +69626,17 @@
visibility="public"
>
</method>
+<method name="isRoaming"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="writeToParcel"
return="void"
abstract="false"
@@ -72469,6 +72492,21 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="lockType" type="int">
+</parameter>
+<parameter name="tag" type="java.lang.String">
+</parameter>
+</method>
+<method name="createWifiLock"
+ return="android.net.wifi.WifiManager.WifiLock"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="tag" type="java.lang.String">
</parameter>
</method>
@@ -72847,6 +72885,28 @@
visibility="public"
>
</field>
+<field name="WIFI_MODE_FULL"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="WIFI_MODE_SCAN_ONLY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="WIFI_STATE_CHANGED_ACTION"
type="java.lang.String"
transient="false"
diff --git a/api/current.xml b/api/current.xml
index 9f9db65..6189632 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -72721,16 +72721,6 @@
>
<implements name="android.os.Parcelable">
</implements>
-<constructor name="NetworkInfo"
- type="android.net.NetworkInfo"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="type" type="int">
-</parameter>
-</constructor>
<method name="describeContents"
return="int"
abstract="false"
@@ -72786,6 +72776,28 @@
visibility="public"
>
</method>
+<method name="getSubtype"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getSubtypeName"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getType"
return="int"
abstract="false"
@@ -72852,6 +72864,17 @@
visibility="public"
>
</method>
+<method name="isRoaming"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="writeToParcel"
return="void"
abstract="false"
@@ -75707,6 +75730,21 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="lockType" type="int">
+</parameter>
+<parameter name="tag" type="java.lang.String">
+</parameter>
+</method>
+<method name="createWifiLock"
+ return="android.net.wifi.WifiManager.WifiLock"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="tag" type="java.lang.String">
</parameter>
</method>
@@ -76084,6 +76122,27 @@
deprecated="not deprecated"
visibility="public"
>
+<field name="WIFI_MODE_FULL"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="WIFI_MODE_SCAN_ONLY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
</field>
<field name="WIFI_STATE_CHANGED_ACTION"
type="java.lang.String"
diff --git a/core/java/android/net/NetworkInfo.java b/core/java/android/net/NetworkInfo.java
index 8c82212..9f53937 100644
--- a/core/java/android/net/NetworkInfo.java
+++ b/core/java/android/net/NetworkInfo.java
@@ -114,8 +114,10 @@
private boolean mIsAvailable;
/**
- * TODO This is going away as soon as API council review happens.
* @param type network type
+ * @deprecated
+ * @hide because this constructor was only meant for internal use (and
+ * has now been superseded by the package-private constructor below).
*/
public NetworkInfo(int type) {}
@@ -146,8 +148,6 @@
* Return a network-type-specific integer describing the subtype
* of the network.
* @return the network subtype
- *
- * @hide pending API council review
*/
public int getSubtype() {
return mSubtype;
@@ -170,8 +170,6 @@
/**
* Return a human-readable name describing the subtype of the network.
* @return the name of the network subtype
- *
- * @hide pending API council review
*/
public String getSubtypeName() {
return mSubtypeName;
@@ -251,8 +249,6 @@
* When {@code true}, it suggests that use of data on this network
* may incur extra costs.
* @return {@code true} if roaming is in effect, {@code false} otherwise.
- *
- * @hide pending API council
*/
public boolean isRoaming() {
return mIsRoaming;
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 483e0fa..a51e88f 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -226,23 +226,21 @@
public static final String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";
/**
- * In this mode, Wi-Fi will be kept active,
+ * In this Wi-Fi lock mode, Wi-Fi will be kept active,
* and will behave normally, i.e., it will attempt to automatically
* establish a connection to a remembered access point that is
* within range, and will do periodic scans if there are remembered
* access points but none are in range.
- * @hide pending API council review
*/
public static final int WIFI_MODE_FULL = 1;
/**
- * In this mode, Wi-Fi will be kept active,
+ * In this Wi-Fi lock mode, Wi-Fi will be kept active,
* but the only operation that will be supported is initiation of
* scans, and the subsequent reporting of scan results. No attempts
* will be made to automatically connect to remembered access points,
* nor will periodic scans be automatically performed looking for
* remembered access points. Scans must be explicitly requested by
* an application in this mode.
- * @hide pending API council review
*/
public static final int WIFI_MODE_SCAN_ONLY = 2;
@@ -805,8 +803,6 @@
* @return a new, unacquired WifiLock with the given tag.
*
* @see WifiLock
- *
- * @hide pending API council review
*/
public WifiLock createWifiLock(int lockType, String tag) {
return new WifiLock(lockType, tag);
