diff options
| author | 2017-04-01 02:13:41 +0000 | |
|---|---|---|
| committer | 2017-04-01 02:13:41 +0000 | |
| commit | 21bd8d5f2ed61a11e52a75dbb5d3b6db36dbda4c (patch) | |
| tree | a879ad8f4e0a73100fa3205dbdfb92c8388699a1 | |
| parent | ec22b62a3aeba3f2e2f9fd669e31972cea123427 (diff) | |
| parent | 5b2e9f40b43e8163447d6af91741fa7cc9f1bc81 (diff) | |
Merge "Fix advertise data size estimation"
am: 5b2e9f40b4
Change-Id: Ic6c0a5d5a988ebeedde333910281af54c026f428
| -rw-r--r-- | core/java/android/bluetooth/le/BluetoothLeAdvertiser.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java index 242ee77ce0e9..07d9b6d08226 100644 --- a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java +++ b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java @@ -56,7 +56,6 @@ public final class BluetoothLeAdvertiser { // Flags field will be set by system. private static final int FLAGS_FIELD_BYTES = 3; private static final int MANUFACTURER_SPECIFIC_DATA_LENGTH = 2; - private static final int SERVICE_DATA_UUID_LENGTH = 2; private final IBluetoothManager mBluetoothManager; private final Handler mHandler; @@ -383,7 +382,8 @@ public final class BluetoothLeAdvertiser { } } for (ParcelUuid uuid : data.getServiceData().keySet()) { - size += OVERHEAD_BYTES_PER_FIELD + SERVICE_DATA_UUID_LENGTH + int uuidLen = BluetoothUuid.uuidToBytes(uuid).length; + size += OVERHEAD_BYTES_PER_FIELD + uuidLen + byteLength(data.getServiceData().get(uuid)); } for (int i = 0; i < data.getManufacturerSpecificData().size(); ++i) { |