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

Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd

Browse Source 
am: 138f75bbc8

Change-Id: I8c821ed86a85892af7a77c4a8080a1e9fde9fdfa
This commit is contained in:
Jakub Pawlowski
2017-05-26 23:14:27 +00:00
committed by android-build-merger
parent 0c7e85da54 138f75bbc8
commit bf79e36f57
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/bluetooth/le/ScanRecord.java
View File

@@ -47,7 +47,9 @@ public final class ScanRecord {
private static final int DATA_TYPE_LOCAL_NAME_SHORT = 0x08; private static final int DATA_TYPE_LOCAL_NAME_SHORT = 0x08;
private static final int DATA_TYPE_LOCAL_NAME_COMPLETE = 0x09; private static final int DATA_TYPE_LOCAL_NAME_COMPLETE = 0x09;
private static final int DATA_TYPE_TX_POWER_LEVEL = 0x0A; private static final int DATA_TYPE_TX_POWER_LEVEL = 0x0A;
private static final int DATA_TYPE_SERVICE_DATA = 0x16; private static final int DATA_TYPE_SERVICE_DATA_16_BIT = 0x16;
private static final int DATA_TYPE_SERVICE_DATA_32_BIT = 0x20;
private static final int DATA_TYPE_SERVICE_DATA_128_BIT = 0x21;
private static final int DATA_TYPE_MANUFACTURER_SPECIFIC_DATA = 0xFF; private static final int DATA_TYPE_MANUFACTURER_SPECIFIC_DATA = 0xFF;
// Flags of the advertising data. // Flags of the advertising data.
@@ -224,10 +226,16 @@ public final class ScanRecord {
case DATA_TYPE_TX_POWER_LEVEL: case DATA_TYPE_TX_POWER_LEVEL:
txPowerLevel = scanRecord[currentPos]; txPowerLevel = scanRecord[currentPos];
break; break;
case DATA_TYPE_SERVICE_DATA: case DATA_TYPE_SERVICE_DATA_16_BIT:
// The first two bytes of the service data are service data UUID in little case DATA_TYPE_SERVICE_DATA_32_BIT:
// endian. The rest bytes are service data. case DATA_TYPE_SERVICE_DATA_128_BIT:
int serviceUuidLength = BluetoothUuid.UUID_BYTES_16_BIT; int serviceUuidLength = BluetoothUuid.UUID_BYTES_16_BIT;
if (fieldType == DATA_TYPE_SERVICE_DATA_32_BIT) {
serviceUuidLength = BluetoothUuid.UUID_BYTES_32_BIT;
} else if (fieldType == DATA_TYPE_SERVICE_DATA_128_BIT) {
serviceUuidLength = BluetoothUuid.UUID_BYTES_128_BIT;
}
byte[] serviceDataUuidBytes = extractBytes(scanRecord, currentPos, byte[] serviceDataUuidBytes = extractBytes(scanRecord, currentPos,
serviceUuidLength); serviceUuidLength);
ParcelUuid serviceDataUuid = BluetoothUuid.parseUuidFrom( ParcelUuid serviceDataUuid = BluetoothUuid.parseUuidFrom(