Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e77adabe: Don\'t compute flags length for scan response

Browse Source 
* commit 'e77adabeafa16f9b401a6ad67405205bd96f2219':
  Don't compute flags length for scan response
This commit is contained in:
Prerepa Viswanadham
2015-01-23 17:56:28 +00:00
committed by Android Git Automerger
parent 9e9885e1c0 e77adabeaf
commit 76552bb963
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/bluetooth/le/BluetoothLeAdvertiser.java
View File

@@ -119,7 +119,7 @@ public final class BluetoothLeAdvertiser {
}
boolean isConnectable = settings.isConnectable();
if (totalBytes(advertiseData, isConnectable) > MAX_ADVERTISING_DATA_BYTES ||
totalBytes(scanResponse, isConnectable) > MAX_ADVERTISING_DATA_BYTES) {
totalBytes(scanResponse, false) > MAX_ADVERTISING_DATA_BYTES) {
postStartFailure(callback, AdvertiseCallback.ADVERTISE_FAILED_DATA_TOO_LARGE);
return;
}
@@ -171,11 +171,11 @@ public final class BluetoothLeAdvertiser {
mLeAdvertisers.clear();
}
// Compute the size of the advertise data.
private int totalBytes(AdvertiseData data, boolean isConnectable) {
// Compute the size of advertisement data or scan resp
private int totalBytes(AdvertiseData data, boolean isFlagsIncluded) {
if (data == null) return 0;
// Flags field is omitted if the advertising is not connectable.
int size = isConnectable ? FLAGS_FIELD_BYTES : 0;
int size = (isFlagsIncluded) ? FLAGS_FIELD_BYTES : 0;
if (data.getServiceUuids() != null) {
int num16BitUuids = 0;
int num32BitUuids = 0;