summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-04-11 06:07:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-11 06:07:33 +0000
commitf8a67f4f5dd4c5499a6e7148331f0286e31203ec (patch)
tree239ea30b0a42e1f6f8284cb2b7661c4ac778f81d /core/java
parent3eba934a2747f71fa0aba2e1949567c786265359 (diff)
parent3b64f38a167dd755977b01a339cb7724e05efbea (diff)
Merge "Make BluetoothGattServer.close() public" into jb-mr2-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/bluetooth/BluetoothGattServer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothGattServer.java b/core/java/android/bluetooth/BluetoothGattServer.java
index 644c619b9a66..d7f150b31910 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();
}