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

Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6 am: 9f8fd40407

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

Change-Id: Iab03a5437fd38009ef272865d065a37cd98c3c6a
This commit is contained in:
Treehugger Robot
2021-03-19 22:10:37 +00:00
committed by Automerger Merge Worker
parent a4d053d2e1 9f8fd40407
commit 1a71a8825b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -1687,6 +1687,7 @@ package android.bluetooth {
field public static final int LE_FLAG_SIMULTANEOUS_CONTROLLER = 3; // 0x3 field public static final int LE_FLAG_SIMULTANEOUS_CONTROLLER = 3; // 0x3
field public static final int LE_FLAG_SIMULTANEOUS_HOST = 4; // 0x4 field public static final int LE_FLAG_SIMULTANEOUS_HOST = 4; // 0x4
field public static final int LE_TK_OCTETS = 16; // 0x10 field public static final int LE_TK_OCTETS = 16; // 0x10
field public static final int OOB_LENGTH_OCTETS = 2; // 0x2
field public static final int RANDOMIZER_OCTETS = 16; // 0x10 field public static final int RANDOMIZER_OCTETS = 16; // 0x10
} }

3
core/java/android/bluetooth/OobData.java
View File

@@ -76,7 +76,7 @@ public final class OobData implements Parcelable {
private static final String TAG = "OobData"; private static final String TAG = "OobData";
/** The {@link OobData#mClassicLength} may be. (AD 3.1.1) (CSS 1.6.2) @hide */ /** The {@link OobData#mClassicLength} may be. (AD 3.1.1) (CSS 1.6.2) @hide */
@SystemApi @SystemApi
private static final int OOB_LENGTH_OCTETS = 2; public static final int OOB_LENGTH_OCTETS = 2;
/** /**
* The length for the {@link OobData#mDeviceAddressWithType}(6) and Address Type(1). * The length for the {@link OobData#mDeviceAddressWithType}(6) and Address Type(1).
* (AD 3.1.2) (CSS 1.6.2) * (AD 3.1.2) (CSS 1.6.2)
@@ -590,7 +590,6 @@ public final class OobData implements Parcelable {
* *
* @hide * @hide
*/ */
@SystemApi
private ClassicBuilder(@NonNull byte[] confirmationHash, @NonNull byte[] classicLength, private ClassicBuilder(@NonNull byte[] confirmationHash, @NonNull byte[] classicLength,
@NonNull byte[] deviceAddressWithType) { @NonNull byte[] deviceAddressWithType) {
Preconditions.checkNotNull(confirmationHash); Preconditions.checkNotNull(confirmationHash);