Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make BluetoothGattServer.close() public" into jb-mr2-dev

Browse Source
This commit is contained in:
Matthew Xie
2013-04-11 06:07:33 +00:00
committed by Android (Google) Code Review
parent 3eba934a27 3b64f38a16
commit f8a67f4f5d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -5018,6 +5018,7 @@ package android.bluetooth {
method public boolean addService(android.bluetooth.BluetoothGattService); method public boolean addService(android.bluetooth.BluetoothGattService);
method public void cancelConnection(android.bluetooth.BluetoothDevice); method public void cancelConnection(android.bluetooth.BluetoothDevice);
method public void clearServices(); method public void clearServices();
method public void close();
method public boolean connect(android.bluetooth.BluetoothDevice, boolean); method public boolean connect(android.bluetooth.BluetoothDevice, boolean);
method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices(); method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
method public int getConnectionState(android.bluetooth.BluetoothDevice); method public int getConnectionState(android.bluetooth.BluetoothDevice);

4
core/java/android/bluetooth/BluetoothGattServer.java
View File

@@ -288,9 +288,9 @@ public final class BluetoothGattServer implements BluetoothProfile {
} }
/** /**
* Close the connection to the gatt service. * Close this GATT server instance.
*/ */
/*package*/ void close() { public void close() {
if (DBG) Log.d(TAG, "close()"); if (DBG) Log.d(TAG, "close()");
unregisterCallback(); unregisterCallback();
} }