diff options
| author | Nick Pelly <npelly@google.com> | 2009-10-07 16:41:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-07 16:41:37 -0700 |
| commit | b2ad0f18bc030535687aed67f5c3a3139045dd84 (patch) | |
| tree | 0afdd1fc2223ce19299439488a87c1f0c6fc8b7f /api/current.xml | |
| parent | 10a5576559def7bbd481527c07fd1f94d6eef900 (diff) | |
| parent | 8af4d8797fbaff195d12ee1e5d9b9578edf31b57 (diff) | |
| download | frameworks_base-b2ad0f18bc030535687aed67f5c3a3139045dd84.zip frameworks_base-b2ad0f18bc030535687aed67f5c3a3139045dd84.tar.gz frameworks_base-b2ad0f18bc030535687aed67f5c3a3139045dd84.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 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/api/current.xml b/api/current.xml index e977710..b269c82 100644 --- a/api/current.xml +++ b/api/current.xml @@ -25550,6 +25550,17 @@ visibility="public" > </method> +<method name="getDefaultAdapter" + return="android.bluetooth.BluetoothAdapter" + abstract="false" + native="false" + synchronized="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getName" return="java.lang.String" abstract="false" @@ -31505,17 +31516,6 @@ visibility="public" > </field> -<field name="BLUETOOTH_SERVICE" - type="java.lang.String" - transient="false" - volatile="false" - value=""bluetooth"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="CLIPBOARD_SERVICE" type="java.lang.String" transient="false" |