bluetooth: android: Confirm the notify session after the descriptor has been written.

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;
 import android.os.ParcelUuid;
 
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * Exposes android.bluetooth.BluetoothDevice as necessary for C++
  * device::BluetoothDeviceAndroid.
  *
  * Lifetime is controlled by device::BluetoothDeviceAndroid.
  */
 @JNINamespace("device")
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 final class ChromeBluetoothDevice {
@@ skipping 217 matching lines @@
                     if (chromeCharacteristic == null) {
                         // Android events arriving with no Chrome object is expected rarely: only
                         // when the event races object destruction.
                         Log.v(TAG, "onCharacteristicWrite when chromeCharacteristic == null.");
                     } else {
                         chromeCharacteristic.onCharacteristicWrite(status);
                     }
                 }
             });
         }
+
+        @Override
+        public void onDescriptorRead(
+                final Wrappers.BluetoothGattDescriptorWrapper descriptor, final int status) {
+            ThreadUtils.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    ChromeBluetoothRemoteGattDescriptor chromeDescriptor =
+                            mWrapperToChromeDescriptorsMap.get(descriptor);
+                    if (chromeDescriptor == null) {
+                        Log.v(TAG, "onDescriptorRead when chromeDescriptor == null.");

[scheib, 2016/02/26 04:27:01]

Copy the comments from characteristics above as well explaining why this
situation happens.

[tommyt, 2016/03/01 14:45:14]

Done.

+                    } else {
+                        chromeDescriptor.onDescriptorRead(status);
+                    }
+                }
+            });
+        }
+
+        @Override
+        public void onDescriptorWrite(
+                final Wrappers.BluetoothGattDescriptorWrapper descriptor, final int status) {
+            ThreadUtils.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (descriptor.getUuid().equals(
+                                UUID.fromString("00002902-0000-1000-8000-00805F9B34FB"))) {

[scheib, 2016/02/26 04:27:01]

// If this is the Client Configuration Characteristic descriptor check
// the associated characteristic to see if startNotifySession is waiting
// for the descriptor write to be completed. 

Move the constant value to a static member on
ChromeBluetoothRemoteGattCharacteristic and use it here and in
startNotifySession.

[tommyt, 2016/03/01 14:45:14]

Done.

+                        ChromeBluetoothRemoteGattCharacteristic chromeCharacteristic =
+                                mWrapperToChromeCharacteristicsMap.get(
+                                        descriptor.getCharacteristic());
+                        if (chromeCharacteristic != null
+                                && chromeCharacteristic.onStartNotifySession(status)) {
+                            return;
+                        }
+                    }
+
+                    ChromeBluetoothRemoteGattDescriptor chromeDescriptor =
+                            mWrapperToChromeDescriptorsMap.get(descriptor);
+                    if (chromeDescriptor == null) {
+                        Log.v(TAG, "onDescriptorWrite when chromeDescriptor == null.");
+                    } else {
+                        chromeDescriptor.onDescriptorWrite(status);
+                    }
+                }
+            });
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
     // BluetoothAdapterDevice C++ methods declared for access from java:
 
     // Binds to BluetoothDeviceAndroid::OnConnectionStateChange.
     private native void nativeOnConnectionStateChange(
             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);
 }