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

Commit 045537e5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update API docs to state that the IRK must be supplied in little endian... 

Merge "Update API docs to state that the IRK must be supplied in little endian byte order" into tm-dev am: 83094ae5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18762793



Change-Id: Ia37d6b13011239da3ce8c8187900a2a152a937f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1896010 83094ae5

framework/java/android/bluetooth/le/ScanFilter.java

+4 −5
Original line number Diff line number Diff line
@@ -742,11 +742,11 @@ public final class ScanFilter implements Parcelable { 
         * address can be validated using {@link BluetoothAdapter#checkBluetoothAddress}.

         * <p>

         * The IRK is used to resolve a static address from a private address. The IRK must be

         * provided in big endian byte order.

         * provided in little endian byte order.

         *

         * @param deviceAddress the remote device Bluetooth address for the filter

         * @param addressType indication of the type of address

         * @param irk non-null byte array representing the Identity Resolving Key

         * @param irk non-null little endian byte array representing the Identity Resolving Key

         *

         * @throws IllegalArgumentException If the {@code deviceAddress} is invalid

         * @throws IllegalArgumentException if the {@code irk} is invalid length
@@ -777,9 +777,8 @@ public final class ScanFilter implements Parcelable { 
         * format of "01:02:03:AB:CD:EF". The device address can be validated using {@link

         * BluetoothAdapter#checkBluetoothAddress}.

         * @param addressType indication of the type of address

         * e.g. {@link BluetoothDevice#ADDRESS_TYPE_PUBLIC}

         * @param irk non-null byte array representing the Identity Resolving Address; nullable

         * internally.

         * @param irk non-null little endian byte array representing the Identity Resolving Key;

         *            nullable internally.

         *

         * @throws IllegalArgumentException if the {@code deviceAddress} is invalid

         * @throws IllegalArgumentException if the {@code addressType} is not PUBLIC or RANDOM