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

device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.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.Manifest;
 import android.annotation.TargetApi;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ skipping 336 matching lines @@
 
         boolean setCharacteristicNotification(
                 BluetoothGattCharacteristicWrapper characteristic, boolean enable) {
             return mGatt.setCharacteristicNotification(characteristic.mCharacteristic, enable);
         }
 
         boolean writeCharacteristic(BluetoothGattCharacteristicWrapper characteristic) {
             return mGatt.writeCharacteristic(characteristic.mCharacteristic);
         }
 
+        boolean readDescriptor(BluetoothGattDescriptorWrapper descriptor) {
+            return mGatt.readDescriptor(descriptor.mDescriptor);
+        }
+
         boolean writeDescriptor(BluetoothGattDescriptorWrapper descriptor) {
             return mGatt.writeDescriptor(descriptor.mDescriptor);
         }
     }
 
     /**
      * Implements android.bluetooth.BluetoothGattCallback and forwards calls through
      * to a provided BluetoothGattCallbackWrapper instance.
      *
      * This class is required so that Fakes can use BluetoothGattCallbackWrapper
@@ skipping 26 matching lines @@
         }
 
         @Override
         public void onCharacteristicWrite(
                 BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
             mWrapperCallback.onCharacteristicWrite(
                     mDeviceWrapper.mCharacteristicsToWrappers.get(characteristic), status);
         }
 
         @Override
+        public void onDescriptorRead(
+                BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+            mWrapperCallback.onDescriptorRead(
+                    mDeviceWrapper.mDescriptorsToWrappers.get(descriptor), status);
+        }
+
+        @Override
+        public void onDescriptorWrite(
+                BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+            mWrapperCallback.onDescriptorWrite(
+                    mDeviceWrapper.mDescriptorsToWrappers.get(descriptor), status);
+        }
+
+        @Override
         public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
             mWrapperCallback.onConnectionStateChange(status, newState);
         }
 
         @Override
         public void onServicesDiscovered(BluetoothGatt gatt, int status) {
             mWrapperCallback.onServicesDiscovered(status);
         }
     }
 
     /**
      * Wrapper alternative to android.bluetooth.BluetoothGattCallback allowing clients and Fakes to
      * work on older SDK versions without having a dependency on the class not defined there.
      *
      * BluetoothGatt gatt parameters are omitted from methods as each call would
      * need to look up the correct BluetoothGattWrapper instance.
      * Client code should cache the BluetoothGattWrapper provided if
      * necessary from the initial BluetoothDeviceWrapper.connectGatt
      * call.
      */
     abstract static class BluetoothGattCallbackWrapper {
         public abstract void onCharacteristicChanged(
                 BluetoothGattCharacteristicWrapper characteristic);
         public abstract void onCharacteristicRead(
                 BluetoothGattCharacteristicWrapper characteristic, int status);
         public abstract void onCharacteristicWrite(
                 BluetoothGattCharacteristicWrapper characteristic, int status);
+        public abstract void onDescriptorRead(
+                BluetoothGattDescriptorWrapper descriptor, int status);
+        public abstract void onDescriptorWrite(
+                BluetoothGattDescriptorWrapper descriptor, int status);
         public abstract void onConnectionStateChange(int status, int newState);
         public abstract void onServicesDiscovered(int status);
     }
 
     /**
      * Wraps android.bluetooth.BluetoothGattService.
      */
     static class BluetoothGattServiceWrapper {
         private final BluetoothGattService mService;
         private final BluetoothDeviceWrapper mDeviceWrapper;
@@ skipping 47 matching lines @@
         public BluetoothGattDescriptorWrapper getDescriptor(UUID uuid) {
             BluetoothGattDescriptor descriptor = mCharacteristic.getDescriptor(uuid);
             if (descriptor == null) {
                 return null;
             }
 
             BluetoothGattDescriptorWrapper descriptorWrapper =
                     mDeviceWrapper.mDescriptorsToWrappers.get(descriptor);
 
             if (descriptorWrapper == null) {
-                descriptorWrapper = new BluetoothGattDescriptorWrapper(descriptor);
+                descriptorWrapper = new BluetoothGattDescriptorWrapper(descriptor, mDeviceWrapper);
                 mDeviceWrapper.mDescriptorsToWrappers.put(descriptor, descriptorWrapper);
             }
             return descriptorWrapper;
         }
 
         public List<BluetoothGattDescriptorWrapper> getDescriptors() {
             List<BluetoothGattDescriptor> descriptors = mCharacteristic.getDescriptors();
 
             ArrayList<BluetoothGattDescriptorWrapper> descriptorsWrapped =
                     new ArrayList<BluetoothGattDescriptorWrapper>(descriptors.size());
 
             for (BluetoothGattDescriptor descriptor : descriptors) {
                 BluetoothGattDescriptorWrapper descriptorWrapper =
                         mDeviceWrapper.mDescriptorsToWrappers.get(descriptor);
                 if (descriptorWrapper == null) {
-                    descriptorWrapper = new BluetoothGattDescriptorWrapper(descriptor);
+                    descriptorWrapper =
+                            new BluetoothGattDescriptorWrapper(descriptor, mDeviceWrapper);
                     mDeviceWrapper.mDescriptorsToWrappers.put(descriptor, descriptorWrapper);
                 }
                 descriptorsWrapped.add(descriptorWrapper);
             }
             return descriptorsWrapped;
         }
 
         public int getInstanceId() {
             return mCharacteristic.getInstanceId();
         }
@@ skipping 13 matching lines @@
         public boolean setValue(byte[] value) {
             return mCharacteristic.setValue(value);
         }
     }
 
     /**
      * Wraps android.bluetooth.BluetoothGattDescriptor.
      */
     static class BluetoothGattDescriptorWrapper {
         private final BluetoothGattDescriptor mDescriptor;
+        final BluetoothDeviceWrapper mDeviceWrapper;
 
-        public BluetoothGattDescriptorWrapper(BluetoothGattDescriptor descriptor) {
+        public BluetoothGattDescriptorWrapper(
+                BluetoothGattDescriptor descriptor, BluetoothDeviceWrapper deviceWrapper) {
             mDescriptor = descriptor;
+            mDeviceWrapper = deviceWrapper;
+        }
+
+        public BluetoothGattCharacteristicWrapper getCharacteristic() {
+            return mDeviceWrapper.mCharacteristicsToWrappers.get(mDescriptor.getCharacteristic());
         }
 
         public UUID getUuid() {
             return mDescriptor.getUuid();
         }
 
         public byte[] getValue() {
             return mDescriptor.getValue();
         }
 
         public boolean setValue(byte[] value) {
             return mDescriptor.setValue(value);
         }
     }
 }