diff options
| author | Matthew Xie <mattx@google.com> | 2011-11-07 22:42:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-07 22:42:00 -0800 |
| commit | 67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5 (patch) | |
| tree | 5b5cd778c318aa226465f2a80526f967739c46de /api | |
| parent | 7f1c94e198e051bf481fd2d286c7b33d00664f9d (diff) | |
| parent | ae5839dcad76625313e6736d69eeaf37af435a3f (diff) | |
| download | frameworks_base-67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5.zip frameworks_base-67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5.tar.gz frameworks_base-67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5.tar.bz2 | |
Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index cc7f0798..c624566 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4474,10 +4474,12 @@ package android.bluetooth { method public android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException; method public android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException; method public int describeContents(); + method public boolean fetchUuidsWithSdp(); method public java.lang.String getAddress(); method public android.bluetooth.BluetoothClass getBluetoothClass(); method public int getBondState(); method public java.lang.String getName(); + method public android.os.ParcelUuid[] getUuids(); method public void writeToParcel(android.os.Parcel, int); field public static final java.lang.String ACTION_ACL_CONNECTED = "android.bluetooth.device.action.ACL_CONNECTED"; field public static final java.lang.String ACTION_ACL_DISCONNECTED = "android.bluetooth.device.action.ACL_DISCONNECTED"; @@ -4486,6 +4488,7 @@ package android.bluetooth { field public static final java.lang.String ACTION_CLASS_CHANGED = "android.bluetooth.device.action.CLASS_CHANGED"; field public static final java.lang.String ACTION_FOUND = "android.bluetooth.device.action.FOUND"; field public static final java.lang.String ACTION_NAME_CHANGED = "android.bluetooth.device.action.NAME_CHANGED"; + field public static final java.lang.String ACTION_UUID = "android.bleutooth.device.action.UUID"; field public static final int BOND_BONDED = 12; // 0xc field public static final int BOND_BONDING = 11; // 0xb field public static final int BOND_NONE = 10; // 0xa |