diff options
author | Jaikumar Ganesh <jaikumar@google.com> | 2011-01-14 16:15:29 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-14 16:15:29 -0800 |
commit | ef6abd8a3e4b05cb9d94f29f4e8ffc7bb2ecec77 (patch) | |
tree | 5d40eff2694b6e2b8ccecf68465ce607d0403391 /api | |
parent | dd4a1e3825f4f379ba36fd721f78de0101bb1833 (diff) | |
parent | a788a9430956dabbc1387e5cccc15f9f41639c95 (diff) | |
download | frameworks_base-ef6abd8a3e4b05cb9d94f29f4e8ffc7bb2ecec77.zip frameworks_base-ef6abd8a3e4b05cb9d94f29f4e8ffc7bb2ecec77.tar.gz frameworks_base-ef6abd8a3e4b05cb9d94f29f4e8ffc7bb2ecec77.tar.bz2 |
am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
* commit 'a788a9430956dabbc1387e5cccc15f9f41639c95':
Do Not Merge: Expose insecure rfcomm Bluetooth API.
Diffstat (limited to 'api')
-rw-r--r-- | api/current.xml | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 36bb049..a97690f 100644 --- a/api/current.xml +++ b/api/current.xml @@ -29413,6 +29413,23 @@ visibility="public" > </method> +<method name="listenUsingInsecureRfcommWithServiceRecord" + return="android.bluetooth.BluetoothServerSocket" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="name" type="java.lang.String"> +</parameter> +<parameter name="uuid" type="java.util.UUID"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +</method> <method name="listenUsingRfcommWithServiceRecord" return="android.bluetooth.BluetoothServerSocket" abstract="false" @@ -30599,6 +30616,21 @@ > <implements name="android.os.Parcelable"> </implements> +<method name="createInsecureRfcommSocketToServiceRecord" + return="android.bluetooth.BluetoothSocket" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uuid" type="java.util.UUID"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +</method> <method name="createRfcommSocketToServiceRecord" return="android.bluetooth.BluetoothSocket" abstract="false" |