Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09e49980 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

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

* commit 'f8a67f4f':
  Make BluetoothGattServer.close() public
parents 4e8a3bcf f8a67f4f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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();

    }