diff options
| author | Nick Pelly <npelly@google.com> | 2009-10-07 16:36:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-07 16:36:15 -0700 |
| commit | d7ebc7a42d52063f731890f42206162c38702e0c (patch) | |
| tree | c3c1285fafb48cadb4226cea03ce702ac7e18130 /api/current.xml | |
| parent | 55a17d6e6d453715d137c63be17404e5c24d30f4 (diff) | |
| parent | 7a865a5de8214aa4975371b9d8a2165a01f6b69c (diff) | |
| download | frameworks_base-d7ebc7a42d52063f731890f42206162c38702e0c.zip frameworks_base-d7ebc7a42d52063f731890f42206162c38702e0c.tar.gz frameworks_base-d7ebc7a42d52063f731890f42206162c38702e0c.tar.bz2 | |
am 7a865a5d: Merge change Ieed8be00 into eclair
Merge commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c' into eclair-mr2
* commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c':
Introduce BluetoothAdapter.getDefaultAdapter().
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" |