Call BluetoothGatt#close() after disconnecting

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.device.bluetooth;
 
 import android.annotation.TargetApi;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.Build;
@@ skipping 41 matching lines @@
         mWrapperToChromeDescriptorsMap = new HashMap<Wrappers.BluetoothGattDescriptorWrapper,
                 ChromeBluetoothRemoteGattDescriptor>();
         Log.v(TAG, "ChromeBluetoothDevice created.");
     }
 
     /**
      * Handles C++ object being destroyed.
      */
     @CalledByNative
     private void onBluetoothDeviceAndroidDestruction() {
-        disconnectGatt();
+        if (mBluetoothGatt != null) {
+            mBluetoothGatt.close();
+            mBluetoothGatt = null;
+        }
         mNativeBluetoothDeviceAndroid = 0;
     }
 
     // ---------------------------------------------------------------------------------------------
     // BluetoothDeviceAndroid methods implemented in java:
 
     // Implements BluetoothDeviceAndroid::Create.
     // 'Object' type must be used because inner class Wrappers.BluetoothDeviceWrapper reference is
     // not handled by jni_generator.py JavaToJni. http://crbug.com/505554
     @CalledByNative
@@ skipping 39 matching lines @@
     private String[] getUuids() {
         // TODO(scheib): return merged list of UUIDs from scan results and,
         // after a device is connected, discoverServices. crbug.com/508648
         return mUuidsFromScan.toArray(new String[mUuidsFromScan.size()]);
     }
 
     // Implements BluetoothDeviceAndroid::CreateGattConnectionImpl.
     @CalledByNative
     private void createGattConnectionImpl(Context context) {
         Log.i(TAG, "connectGatt");
+
+        if (mBluetoothGatt != null) mBluetoothGatt.close();
+
         // autoConnect set to false as under experimentation using autoConnect failed to complete
         // connections.
         mBluetoothGatt =
                 mDevice.connectGatt(context, false /* autoConnect */, mBluetoothGattCallbackImpl);
     }
 
     // Implements BluetoothDeviceAndroid::DisconnectGatt.
     @CalledByNative
     private void disconnectGatt() {
         Log.i(TAG, "BluetoothGatt.disconnect");
         if (mBluetoothGatt != null) mBluetoothGatt.disconnect();
     }
 
     // Implements BluetoothDeviceAndroid::GetDeviceName.
     @CalledByNative
     private String getDeviceName() {
         return mDevice.getName();
     }
 
     // Implements callbacks related to a GATT connection.
     private class BluetoothGattCallbackImpl extends Wrappers.BluetoothGattCallbackWrapper {
         @Override
         public void onConnectionStateChange(final int status, final int newState) {
             Log.i(TAG, "onConnectionStateChange status:%d newState:%s", status,
                     (newState == android.bluetooth.BluetoothProfile.STATE_CONNECTED)
                             ? "Connected"
                             : "Disconnected");
             if (newState == android.bluetooth.BluetoothProfile.STATE_CONNECTED) {
                 mBluetoothGatt.discoverServices();
+            } else if (newState == android.bluetooth.BluetoothProfile.STATE_DISCONNECTED) {
+                if (mBluetoothGatt != null) {
+                    mBluetoothGatt.close();
+                    mBluetoothGatt = null;
+                }
             }
             ThreadUtils.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     if (mNativeBluetoothDeviceAndroid != 0) {
                         nativeOnConnectionStateChange(mNativeBluetoothDeviceAndroid, status,
                                 newState == android.bluetooth.BluetoothProfile.STATE_CONNECTED);
                     }
                 }
             });
@@ skipping 93 matching lines @@
             long nativeBluetoothDeviceAndroid, int status, boolean connected);
 
     // Binds to BluetoothDeviceAndroid::CreateGattRemoteService.
     // TODO(http://crbug.com/505554): Replace 'Object' with specific type when JNI fixed.
     private native void nativeCreateGattRemoteService(long nativeBluetoothDeviceAndroid,
             String instanceId, Object bluetoothGattServiceWrapper);
 
     // Binds to BluetoothDeviceAndroid::GattServicesDiscovered.
     private native void nativeOnGattServicesDiscovered(long nativeBluetoothDeviceAndroid);
 }