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

Merge "Add implementation for IRK to parcelable functions." am: 400c21483c am: 234cdb9d8a am: a2657cf70a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1780808

Change-Id: I7aafcd520517394a290a49a42034468d9ca72e7e
This commit is contained in:
Martin Brabham
2021-07-30 00:16:07 +00:00
committed by Automerger Merge Worker
parent 452e060790 a2657cf70a
commit a31665ab13
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/bluetooth/le/ScanFilter.java
View File

@@ -168,6 +168,15 @@ public final class ScanFilter implements Parcelable {
dest.writeByteArray(mManufacturerDataMask);
}
}
// IRK
if (mDeviceAddress != null) {
dest.writeInt(mAddressType);
dest.writeInt(mIrk == null ? 0 : 1);
if (mIrk != null) {
dest.writeByteArray(mIrk);
}
}
}
/**
@@ -187,8 +196,10 @@ public final class ScanFilter implements Parcelable {
if (in.readInt() == 1) {
builder.setDeviceName(in.readString());
}
String address = null;
// If we have a non-null address
if (in.readInt() == 1) {
builder.setDeviceAddress(in.readString());
address = in.readString();
}
if (in.readInt() == 1) {
ParcelUuid uuid = in.readParcelable(ParcelUuid.class.getClassLoader());
@@ -245,6 +256,17 @@ public final class ScanFilter implements Parcelable {
}
}
// IRK
if (address != null) {
final int addressType = in.readInt();
if (in.readInt() == 1) {
final byte[] irk = new byte[16];
in.readByteArray(irk);
builder.setDeviceAddress(address, addressType, irk);
} else {
builder.setDeviceAddress(address, addressType);
}
}
return builder.build();
}
};