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

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

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();
     }