commit f8a67f4f5dd4c5499a6e7148331f0286e31203ec
author Matthew Xie <mattx@google.com> Thu Apr 11 06:07:33 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 11 06:07:33 2013 +0000
tree 239ea30b0a42e1f6f8284cb2b7661c4ac778f81d
parent 3eba934a2747f71fa0aba2e1949567c786265359
parent 3b64f38a167dd755977b01a339cb7724e05efbea

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

api/current.txt

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 @@
     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);

core/java/android/bluetooth/BluetoothGattServer.java

diff --git a/core/java/android/bluetooth/BluetoothGattServer.java b/core/java/android/bluetooth/BluetoothGattServer.java
index 644c619b..d7f150b 100644
--- a/core/java/android/bluetooth/BluetoothGattServer.java
+++ b/core/java/android/bluetooth/BluetoothGattServer.java
@@ -288,9 +288,9 @@
     }
 
     /**
-     * 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();
     }