Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14fe4a01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bluetooth_oob_api" am: ca60ae66 am: 57e839dd 

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

Change-Id: Iab03a5437fd38009ef272865d065a37cd98c3c6a
parents 41e54542 57e839dd

framework/java/android/bluetooth/OobData.java

+1 −2
Original line number Diff line number Diff line
@@ -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);