diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-19 21:44:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 21:44:45 +0000 |
| commit | 9f8fd4040714ab5cf806e15f66336b996f2c7425 (patch) | |
| tree | dd2cef79f9adbead8b2e4ecee8f04ecfeda3350a /core/java | |
| parent | b4f9ff1810d16f51858fd1c1cb41a609731c55e6 (diff) | |
| parent | 55fe87b2f646adc09a600344bca6b89c0ea9c28e (diff) | |
Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640633
Change-Id: I1881ca6a693ec27e78e3f781d87858f27858efbc
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/OobData.java | 3 |
1 files changed, 1 insertions, 2 deletions
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); |