commit 1a71a8825b258999538119c26324053c927dd521
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 19 22:10:37 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 19 22:10:37 2021 +0000
tree cd152031d4b1116150ab9baea7fb3e6c1113d145
parent a4d053d2e1a194a6cf2752b49aca306421f2bf4c
parent 9f8fd4040714ab5cf806e15f66336b996f2c7425

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

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

Change-Id: Iab03a5437fd38009ef272865d065a37cd98c3c6a

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index b55ec6b..2b37fef 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);