diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-10-12 12:36:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-12 12:36:03 -0700 |
| commit | de553351bf25b60873fd5b5bcefb46b550e104aa (patch) | |
| tree | 04851aa7e1495008051906d6635dec839b2c921c /api/current.xml | |
| parent | 66e146b30d40e8d1609c8ccbce9bfd960e5ea166 (diff) | |
| parent | 4c220bd0f32b93314c4c1bff328bd815265ef117 (diff) | |
| download | frameworks_base-de553351bf25b60873fd5b5bcefb46b550e104aa.zip frameworks_base-de553351bf25b60873fd5b5bcefb46b550e104aa.tar.gz frameworks_base-de553351bf25b60873fd5b5bcefb46b550e104aa.tar.bz2 | |
am 4c220bd0: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '4c220bd0f32b93314c4c1bff328bd815265ef117'
* commit '4c220bd0f32b93314c4c1bff328bd815265ef117':
Encourage developers to connect RFCOMM by UUID instead of Channel.
Diffstat (limited to 'api/current.xml')
| -rw-r--r-- | api/current.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api/current.xml b/api/current.xml index e91752f..7245fd4 100644 --- a/api/current.xml +++ b/api/current.xml @@ -25618,7 +25618,7 @@ visibility="public" > </method> -<method name="listenUsingRfcomm" +<method name="listenUsingRfcommWithServiceRecord" return="android.bluetooth.BluetoothServerSocket" abstract="false" native="false" @@ -25630,7 +25630,7 @@ > <parameter name="name" type="java.lang.String"> </parameter> -<parameter name="uuid" type="android.os.ParcelUuid"> +<parameter name="uuid" type="java.util.UUID"> </parameter> <exception name="IOException" type="java.io.IOException"> </exception> @@ -26804,7 +26804,7 @@ > <implements name="android.os.Parcelable"> </implements> -<method name="createRfcommSocket" +<method name="createRfcommSocketToServiceRecord" return="android.bluetooth.BluetoothSocket" abstract="false" native="false" @@ -26814,7 +26814,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="channel" type="int"> +<parameter name="uuid" type="java.util.UUID"> </parameter> <exception name="IOException" type="java.io.IOException"> </exception> |