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

am 2a46722f: Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement\'s adverti

Browse Source 
automerge: fa90087

* commit 'fa900872742252fd0b56760a3390cea38166adb9':
  Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement's advertise data from 24 to 27 bytes.
This commit is contained in:
Tom Turney
2014-11-15 03:33:04 +00:00
committed by android-build-merger
parent fcab74b3ce fa90087274
commit e9f8d1ddbd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,8 +117,9 @@ public final class BluetoothLeAdvertiser {
AdvertiseCallback.ADVERTISE_FAILED_FEATURE_UNSUPPORTED);
return;
}
if (totalBytes(advertiseData) > MAX_ADVERTISING_DATA_BYTES ||
totalBytes(scanResponse) > MAX_ADVERTISING_DATA_BYTES) {
boolean isConnectable = settings.isConnectable();
if (totalBytes(advertiseData, isConnectable) > MAX_ADVERTISING_DATA_BYTES ||
totalBytes(scanResponse, isConnectable) > MAX_ADVERTISING_DATA_BYTES) {
postStartFailure(callback, AdvertiseCallback.ADVERTISE_FAILED_DATA_TOO_LARGE);
return;
}
@@ -171,9 +172,10 @@ public final class BluetoothLeAdvertiser {
}
// Compute the size of the advertise data.
private int totalBytes(AdvertiseData data) {
private int totalBytes(AdvertiseData data, boolean isConnectable) {
if (data == null) return 0;
int size = FLAGS_FIELD_BYTES; // flags field is always set.
// Flags field is omitted if the advertising is not connectable.
int size = isConnectable ? FLAGS_FIELD_BYTES : 0;
if (data.getServiceUuids() != null) {
int num16BitUuids = 0;
int num32BitUuids = 0;