commit 3af765a86366dbaaae327db59ff05eff76d506f6
author Martin Brabham <optedoblivion@google.com> Tue Mar 16 16:22:55 2021 -0700
committer Martin Brabham <optedoblivion@google.com> Tue Mar 16 20:11:05 2021 -0700
tree 475b5528fb645151fd75632231b5fb1fabea022c
parent 96e6e4a0b383ee60ac2cd61fe55688d697f35574

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

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index be3908d..7ab3846 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -1687,6 +1687,7 @@
     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
   }
 

core/java/android/bluetooth/OobData.java

diff --git a/core/java/android/bluetooth/OobData.java b/core/java/android/bluetooth/OobData.java
index 9810746..08d694e 100644
--- a/core/java/android/bluetooth/OobData.java
+++ b/core/java/android/bluetooth/OobData.java
@@ -76,7 +76,7 @@
     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 @@
          *
          * @hide
          */
-        @SystemApi
         private ClassicBuilder(@NonNull byte[] confirmationHash, @NonNull byte[] classicLength,
                 @NonNull byte[] deviceAddressWithType) {
             Preconditions.checkNotNull(confirmationHash);