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

Commit 194a9ad6 authored by Martin Brabham's avatar Martin Brabham Committed by Automerger Merge Worker
Browse files

Merge "Fix CTS Failure" into sc-dev am: 82ba964c 

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

Change-Id: Ic99e307aa22b70bd5ac5e090e40569b58dfa1d1d
parents e354d9ec 82ba964c

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2096,6 +2096,7 @@ package android.bluetooth { 
    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



+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);