diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-28 14:34:28 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-28 14:34:28 -0700 |
| commit | 96cdc61c69aa735e65295a50e3e2922425b3c877 (patch) | |
| tree | 7d88100a2f15856e87086c6dee8a85cad656e1a4 /api | |
| parent | aebadd2cf489948847f262d917ee39cb285815b3 (diff) | |
| parent | 1e2e44e900cb9a25d548e27a20d65292a7f321bc (diff) | |
| download | frameworks_base-96cdc61c69aa735e65295a50e3e2922425b3c877.zip frameworks_base-96cdc61c69aa735e65295a50e3e2922425b3c877.tar.gz frameworks_base-96cdc61c69aa735e65295a50e3e2922425b3c877.tar.bz2 | |
am 1e2e44e9: Merge change 2365 into donut
Merge commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc'
* commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc':
Fix wifi multicast API for public use.
Revert "Bug fixes and performance improvements"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 4db6e66..f93fefd 100644 --- a/api/current.xml +++ b/api/current.xml @@ -309,6 +309,17 @@ visibility="public" > </field> +<field name="CHANGE_WIFI_MULTICAST_STATE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.permission.CHANGE_WIFI_MULTICAST_STATE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="CHANGE_WIFI_STATE" type="java.lang.String" transient="false" @@ -80263,6 +80274,19 @@ <parameter name="rssiB" type="int"> </parameter> </method> +<method name="createMulticastLock" + return="android.net.wifi.WifiManager.MulticastLock" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tag" type="java.lang.String"> +</parameter> +</method> <method name="createWifiLock" return="android.net.wifi.WifiManager.WifiLock" abstract="false" @@ -80755,6 +80779,48 @@ > </field> </class> +<class name="WifiManager.MulticastLock" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="acquire" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isHeld" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="release" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> <class name="WifiManager.WifiLock" extends="java.lang.Object" abstract="false" |