diff options
| author | Matthew Xie <mattx@google.com> | 2013-04-10 23:09:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-10 23:09:41 -0700 |
| commit | 09e49980df612785152f742edc96c1d3116dbe56 (patch) | |
| tree | 709673d2fa644aa58d9e8106b70f1ca40fa0c89a | |
| parent | 4e8a3bcf03cdaeba6ea2f7cbbbb55c7b10c19e9c (diff) | |
| parent | f8a67f4f5dd4c5499a6e7148331f0286e31203ec (diff) | |
| download | frameworks_base-09e49980df612785152f742edc96c1d3116dbe56.zip frameworks_base-09e49980df612785152f742edc96c1d3116dbe56.tar.gz frameworks_base-09e49980df612785152f742edc96c1d3116dbe56.tar.bz2 | |
am f8a67f4f: Merge "Make BluetoothGattServer.close() public" into jb-mr2-dev
* commit 'f8a67f4f5dd4c5499a6e7148331f0286e31203ec':
Make BluetoothGattServer.close() public
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothGattServer.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 7451a93..ef00be7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5018,6 +5018,7 @@ package android.bluetooth { method public boolean addService(android.bluetooth.BluetoothGattService); method public void cancelConnection(android.bluetooth.BluetoothDevice); method public void clearServices(); + method public void close(); method public boolean connect(android.bluetooth.BluetoothDevice, boolean); method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices(); method public int getConnectionState(android.bluetooth.BluetoothDevice); diff --git a/core/java/android/bluetooth/BluetoothGattServer.java b/core/java/android/bluetooth/BluetoothGattServer.java index 644c619..d7f150b 100644 --- a/core/java/android/bluetooth/BluetoothGattServer.java +++ b/core/java/android/bluetooth/BluetoothGattServer.java @@ -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()"); unregisterCallback(); } |