bluetooth: Refactor GetDescriptorForUUID to GetDescriptorsForUUID.

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.os.Build;
 
 import org.chromium.base.Log;
@@ skipping 130 matching lines @@
     private boolean setCharacteristicNotification(boolean enabled) {
         return mChromeDevice.mBluetoothGatt.setCharacteristicNotification(mCharacteristic, enabled);
     }
 
     // Creates objects for all descriptors. Designed only to be called by
     // BluetoothRemoteGattCharacteristicAndroid::EnsureDescriptorsCreated.
     @CalledByNative
     private void createDescriptors() {
         List<Wrappers.BluetoothGattDescriptorWrapper> descriptors =
                 mCharacteristic.getDescriptors();
+        // descriptorInstanceId ensures duplicate UUIDs have unique instance
+        // IDs. BluetoothGattDescriptor does not offer getInstanceId the way
+        // BluetoothGattCharacteristic does.
+        //
+        // TODO(crbug.com/576906) Do not reuse IDs upon onServicesDiscovered.
+        int instanceIdCounter = 0;
         for (Wrappers.BluetoothGattDescriptorWrapper descriptor : descriptors) {
-            // Create an adapter unique descriptor ID.
-            // TODO(crbug.com/576900) Unique descriptorInstanceId duplicate UUID values.
-            String descriptorInstanceId = mInstanceId + "/" + descriptor.getUuid().toString();
+            String descriptorInstanceId = mInstanceId + "/" + instanceIdCounter++;

[ortuno, 2016/03/13 20:41:44]

Hmm I wonder if we should include the UUID. I think it will make it easier to
identify the descriptors in logs, but then we can just include the UUID in the
log anyway. Up to you.

[scheib, 2016/03/25 00:13:57]

Done: Including the UUID.

             nativeCreateGattRemoteDescriptor(mNativeBluetoothRemoteGattCharacteristicAndroid,
                     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::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);
 }