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

Commit 9f8fd404 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bluetooth_oob_api" am: 55fe87b2 

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

Change-Id: I1881ca6a693ec27e78e3f781d87858f27858efbc
parents b4f9ff18 55fe87b2

core/api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -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_CONTROLLER = 3; // 0x3

    field public static final int LE_FLAG_SIMULTANEOUS_HOST = 4; // 0x4

    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 LE_TK_OCTETS = 16; // 0x10

    field public static final int OOB_LENGTH_OCTETS = 2; // 0x2

    field public static final int RANDOMIZER_OCTETS = 16; // 0x10

    field public static final int RANDOMIZER_OCTETS = 16; // 0x10

  }

  }







































core/java/android/bluetooth/OobData.java



+1
−2




























Original line number
Original line
Diff line number
Diff line








@@ -76,7 +76,7 @@ public final class OobData implements Parcelable {









    private static final String TAG = "OobData";







    private static final String TAG = "OobData";











    /** The {@link OobData#mClassicLength} may be. (AD 3.1.1) (CSS 1.6.2) @hide */







    /** The {@link OobData#mClassicLength} may be. (AD 3.1.1) (CSS 1.6.2) @hide */











    @SystemApi







    @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).







     * The length for the {@link OobData#mDeviceAddressWithType}(6) and Address Type(1).











     * (AD 3.1.2) (CSS 1.6.2)







     * (AD 3.1.2) (CSS 1.6.2)










@@ -590,7 +590,6 @@ public final class OobData implements Parcelable {









         *







         *











         * @hide







         * @hide











         */







         */











        @SystemApi














        private ClassicBuilder(@NonNull byte[] confirmationHash, @NonNull byte[] classicLength,







        private ClassicBuilder(@NonNull byte[] confirmationHash, @NonNull byte[] classicLength,











                @NonNull byte[] deviceAddressWithType) {







                @NonNull byte[] deviceAddressWithType) {











            Preconditions.checkNotNull(confirmationHash);







            Preconditions.checkNotNull(confirmationHash);