diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-10-07 15:18:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-07 15:18:09 -0700 |
| commit | 4c220bd0f32b93314c4c1bff328bd815265ef117 (patch) | |
| tree | fc1d093d3197bcae3f4b8acc24f18b93a2dbd98c /api/current.xml | |
| parent | 3504ec10833f7aad7b2f2ea253de8bebaf811455 (diff) | |
| parent | 825a3b20a78df80ee3f5e8965ae2e11c54c5d89b (diff) | |
| download | frameworks_base-4c220bd0f32b93314c4c1bff328bd815265ef117.zip frameworks_base-4c220bd0f32b93314c4c1bff328bd815265ef117.tar.gz frameworks_base-4c220bd0f32b93314c4c1bff328bd815265ef117.tar.bz2 | |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
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 ae9d0bf..e977710 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> |