From 3af765a86366dbaaae327db59ff05eff76d506f6 Mon Sep 17 00:00:00 2001 From: Martin Brabham Date: Tue, 16 Mar 2021 16:22:55 -0700 Subject: Fix CTS Failure Bug: 182849735 Test: atest CtsSystemApiAnnotationTestCases:android.signature.cts.api.AnnotationTest#testAnnotation -- --abi x86_64 Change-Id: I1b9e77b05cd23299bf179c854e136fa341c81566 --- core/api/system-current.txt | 1 + core/java/android/bluetooth/OobData.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index be3908d50763..7ab384679a74 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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_HOST = 4; // 0x4 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 } diff --git a/core/java/android/bluetooth/OobData.java b/core/java/android/bluetooth/OobData.java index 98107461fb4c..08d694eb93e2 100644 --- a/core/java/android/bluetooth/OobData.java +++ b/core/java/android/bluetooth/OobData.java @@ -76,7 +76,7 @@ public final class OobData implements Parcelable { private static final String TAG = "OobData"; /** The {@link OobData#mClassicLength} may be. (AD 3.1.1) (CSS 1.6.2) @hide */ @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). * (AD 3.1.2) (CSS 1.6.2) @@ -590,7 +590,6 @@ public final class OobData implements Parcelable { * * @hide */ - @SystemApi private ClassicBuilder(@NonNull byte[] confirmationHash, @NonNull byte[] classicLength, @NonNull byte[] deviceAddressWithType) { Preconditions.checkNotNull(confirmationHash); -- cgit v1.2.3-59-g8ed1b