diff options
| author | Wei Wang <weiwa@google.com> | 2014-08-01 11:12:37 -0700 |
|---|---|---|
| committer | Wei Wang <weiwa@google.com> | 2014-08-01 11:12:37 -0700 |
| commit | f59709e667cc5e4a4a8927d42fba4a80494c491c (patch) | |
| tree | edd23339dabe718b5099a5ee55f28f4377c38b70 /framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java | |
| parent | a1b8375689f9c33aa913b942bf7de033adcf5bec (diff) | |
Revert "Revert "Service data and manufacturer data can be repeated fields.""
This reverts commit 14c797702543bb5ced989565d90abcfa55c7db46.
Diffstat (limited to 'framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java')
| -rw-r--r-- | framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java index 4d128e7439..8879da7328 100644 --- a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java +++ b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java @@ -209,13 +209,13 @@ public final class BluetoothLeAdvertiser { num128BitUuids * BluetoothUuid.UUID_BYTES_128_BIT; } } - if (data.getServiceDataUuid() != null) { + for (ParcelUuid uuid : data.getServiceData().keySet()) { size += OVERHEAD_BYTES_PER_FIELD + SERVICE_DATA_UUID_LENGTH - + byteLength(data.getServiceData()); + + byteLength(data.getServiceData().get(uuid)); } - if (data.getManufacturerId() > 0) { + for (int i = 0; i < data.getManufacturerSpecificData().size(); ++i) { size += OVERHEAD_BYTES_PER_FIELD + MANUFACTURER_SPECIFIC_DATA_LENGTH + - byteLength(data.getManufacturerSpecificData()); + byteLength(data.getManufacturerSpecificData().valueAt(i)); } if (data.getIncludeTxPowerLevel()) { size += OVERHEAD_BYTES_PER_FIELD + 1; // tx power level value is one byte. |