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

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.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.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
 import android.os.Build;
@@ skipping 14 matching lines @@
  */
 @JNINamespace("device")
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 final class ChromeBluetoothRemoteGattCharacteristic {
     private static final String TAG = "Bluetooth";
 
     private long mNativeBluetoothRemoteGattCharacteristicAndroid;
     final Wrappers.BluetoothGattCharacteristicWrapper mCharacteristic;
     final String mInstanceId;
     final ChromeBluetoothDevice mChromeDevice;
+    private boolean mPendingOnStartNotifySession = false;
 
     private ChromeBluetoothRemoteGattCharacteristic(
             long nativeBluetoothRemoteGattCharacteristicAndroid,
             Wrappers.BluetoothGattCharacteristicWrapper characteristicWrapper, String instanceId,
             ChromeBluetoothDevice chromeDevice) {
         mNativeBluetoothRemoteGattCharacteristicAndroid =
                 nativeBluetoothRemoteGattCharacteristicAndroid;
         mCharacteristic = characteristicWrapper;
         mInstanceId = instanceId;
         mChromeDevice = chromeDevice;
@@ skipping 17 matching lines @@
     }
 
     void onCharacteristicChanged() {
         Log.i(TAG, "onCharacteristicChanged");
         if (mNativeBluetoothRemoteGattCharacteristicAndroid != 0) {
             nativeOnChanged(
                     mNativeBluetoothRemoteGattCharacteristicAndroid, mCharacteristic.getValue());
         }
     }
 
+    boolean onStartNotifySession(int status) {
+        if (!mPendingOnStartNotifySession) {
+            return false;
+        }
+
+        mPendingOnStartNotifySession = false;
+
+        Log.i(TAG, "onStartNotifySession status:%d==%s", status,
+                status == android.bluetooth.BluetoothGatt.GATT_SUCCESS ? "OK" : "Error");
+        if (mNativeBluetoothRemoteGattCharacteristicAndroid != 0) {
+            nativeOnStartNotifySession(mNativeBluetoothRemoteGattCharacteristicAndroid, status);
+        }
+
+        return true;
+    }
+
     void onCharacteristicRead(int status) {
         Log.i(TAG, "onCharacteristicRead status:%d==%s", status,
                 status == android.bluetooth.BluetoothGatt.GATT_SUCCESS ? "OK" : "Error");
         if (mNativeBluetoothRemoteGattCharacteristicAndroid != 0) {
             nativeOnRead(mNativeBluetoothRemoteGattCharacteristicAndroid, status,
                     mCharacteristic.getValue());
         }
     }
 
     void onCharacteristicWrite(int status) {
@@ skipping 68 matching lines @@
             return false;
         }
         Log.v(TAG, hasNotify ? "startNotifySession NOTIFY." : "startNotifySession INDICATE.");
 
         if (!mChromeDevice.mBluetoothGatt.writeDescriptor(
                     clientCharacteristicConfigurationDescriptor)) {
             Log.i(TAG, "startNotifySession writeDescriptor failed!");
             return false;
         }
 
+        mPendingOnStartNotifySession = true;
+
         return true;
     }
 
     // Implements BluetoothRemoteGattCharacteristicAndroid::ReadRemoteCharacteristic.
     @CalledByNative
     private boolean readRemoteCharacteristic() {
         if (!mChromeDevice.mBluetoothGatt.readCharacteristic(mCharacteristic)) {
             Log.i(TAG, "readRemoteCharacteristic readCharacteristic failed.");
             return false;
         }
@@ skipping 28 matching lines @@
                     descriptorInstanceId, descriptor, mChromeDevice);
         }
     }
 
     // ---------------------------------------------------------------------------------------------
     // BluetoothAdapterDevice C++ methods declared for access from java:
 
     // Binds to BluetoothRemoteGattCharacteristicAndroid::OnChanged.
     native void nativeOnChanged(long nativeBluetoothRemoteGattCharacteristicAndroid, byte[] value);
 
+    // Binds to BluetoothRemoteGattCharacteristicAndroid::OnStartNotifySession.
+    native void nativeOnStartNotifySession(
+            long nativeBluetoothRemoteGattCharacteristicAndroid, int status);
+
     // Binds to BluetoothRemoteGattCharacteristicAndroid::OnRead.
     native void nativeOnRead(
             long nativeBluetoothRemoteGattCharacteristicAndroid, int status, byte[] value);
 
     // Binds to BluetoothRemoteGattCharacteristicAndroid::OnWrite.
     native void nativeOnWrite(long nativeBluetoothRemoteGattCharacteristicAndroid, int status);
 
     // Binds to BluetoothRemoteGattCharacteristicAndroid::CreateGattRemoteDescriptor.
     // TODO(http://crbug.com/505554): Replace 'Object' with specific type when JNI fixed.
     private native void nativeCreateGattRemoteDescriptor(
             long nativeBluetoothRemoteGattCharacteristicAndroid, String instanceId,
             Object bluetoothGattDescriptorWrapper, Object chromeBluetoothDevice);
 }