diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-21 20:15:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-21 20:15:38 +0000 |
| commit | bf516b9e11f407b0bb9be8dc5aa83d5ef19cff9b (patch) | |
| tree | 63fbdb90e86e3e1e2e94c5b73f8a4a05c4083c19 /core/api | |
| parent | cfa02cd6872821e695d9c11df3c28408dc84bdb9 (diff) | |
| parent | 045fe260e1677f7442fbecc66085acd1dd23ff7b (diff) | |
Merge "Add new @SystemApi for specifying AddressType and IRK"
Diffstat (limited to 'core/api')
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/api/system-current.txt | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index be9dccce637a..04d5f0f5137e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -8689,6 +8689,8 @@ package android.bluetooth { field public static final String ACTION_NAME_CHANGED = "android.bluetooth.device.action.NAME_CHANGED"; field public static final String ACTION_PAIRING_REQUEST = "android.bluetooth.device.action.PAIRING_REQUEST"; field public static final String ACTION_UUID = "android.bluetooth.device.action.UUID"; + field public static final int ADDRESS_TYPE_PUBLIC = 0; // 0x0 + field public static final int ADDRESS_TYPE_RANDOM = 1; // 0x1 field public static final int BOND_BONDED = 12; // 0xc field public static final int BOND_BONDING = 11; // 0xb field public static final int BOND_NONE = 10; // 0xa diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 407df484c010..b20f63784430 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -1728,6 +1728,17 @@ package android.bluetooth.le { field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.ResultStorageDescriptor> CREATOR; } + public final class ScanFilter implements android.os.Parcelable { + method public int getAddressType(); + method @Nullable public byte[] getIrk(); + } + + public static final class ScanFilter.Builder { + method @NonNull public android.bluetooth.le.ScanFilter.Builder setDeviceAddress(@NonNull String, int); + method @NonNull public android.bluetooth.le.ScanFilter.Builder setDeviceAddress(@NonNull String, int, @NonNull byte[]); + field public static final int LEN_IRK_OCTETS = 16; // 0x10 + } + public final class ScanSettings implements android.os.Parcelable { field public static final int SCAN_MODE_AMBIENT_DISCOVERY = 3; // 0x3 field public static final int SCAN_RESULT_TYPE_ABBREVIATED = 1; // 0x1 |