diff options
| author | Eric Shienbrood <> | 2009-04-14 15:40:20 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-14 15:40:20 -0700 |
| commit | 2ecc74f330959be0a3bde10e55110a8218c0887c (patch) | |
| tree | cd595c05975bd08132ab9c8b2e87af6316c372d3 /api/3.xml | |
| parent | 810ec50a1e2c92c866a271c3597ec257688c0d82 (diff) | |
| download | frameworks_base-2ecc74f330959be0a3bde10e55110a8218c0887c.zip frameworks_base-2ecc74f330959be0a3bde10e55110a8218c0887c.tar.gz frameworks_base-2ecc74f330959be0a3bde10e55110a8218c0887c.tar.bz2 | |
AI 146222: Manual merge of 145980 from donutburger => master.
Automated import of CL 146222
Diffstat (limited to 'api/3.xml')
| -rw-r--r-- | api/3.xml | 82 |
1 files changed, 71 insertions, 11 deletions
@@ -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" |