From 715aa0e1da6024f85b0fcdb875f4c49be5a466ed Mon Sep 17 00:00:00 2001
From: Rahul Sabnis <rahulsabnis@google.com>
Date: Thu, 26 May 2022 13:52:33 -0700
Subject: Update API docs to indicate that BT addresses are to be provided in
 big endian.

Tag: #feature
Bug: 233217148
Test: Manual (docs change)
Ignore-AOSP-First: Android T docs change
Change-Id: Iee36345088c886d5b43120bb10d8ddf52133de07
---
 framework/java/android/bluetooth/BluetoothAdapter.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')

diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index eed12635c5..e4bfc42b86 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -1005,8 +1005,8 @@ public final class BluetoothAdapter {
     /**
      * Get a {@link BluetoothDevice} object for the given Bluetooth hardware
      * address.
-     * <p>Valid Bluetooth hardware addresses must be upper case, in a format
-     * such as "00:11:22:33:AA:BB". The helper {@link #checkBluetoothAddress} is
+     * <p>Valid Bluetooth hardware addresses must be upper case, in big endian byte order, and in a
+     * format such as "00:11:22:33:AA:BB". The helper {@link #checkBluetoothAddress} is
      * available to validate a Bluetooth address.
      * <p>A {@link BluetoothDevice} will always be returned for a valid
      * hardware address, even if this adapter has never seen that device.
@@ -1024,8 +1024,8 @@ public final class BluetoothAdapter {
     /**
      * Get a {@link BluetoothDevice} object for the given Bluetooth hardware
      * address and addressType.
-     * <p>Valid Bluetooth hardware addresses must be upper case, in a format
-     * such as "00:11:22:33:AA:BB". The helper {@link #checkBluetoothAddress} is
+     * <p>Valid Bluetooth hardware addresses must be upper case, in big endian byte order, and in a
+     * format such as "00:11:22:33:AA:BB". The helper {@link #checkBluetoothAddress} is
      * available to validate a Bluetooth address.
      * <p>A {@link BluetoothDevice} will always be returned for a valid
      * hardware address and type, even if this adapter has never seen that device.
-- 
cgit v1.2.3


From 87e5ce2d1145387388a14f053c7e9f28d4b929ae Mon Sep 17 00:00:00 2001
From: Etienne Ruffieux <eruffieux@google.com>
Date: Mon, 6 Jun 2022 17:34:43 -0700
Subject: Modify incorrect API documentation

BluetoothAdapter#listenUsingInsecureRfcommWithServiceRecord
description was stating user should call
BluetoothDevice#createRfcommSocketToServiceRecord to
connect, but user should use
BluetoothDevice#createInsecureRfcommSocketToServiceRecord
instead.

Tag: #feature
Test: build
Bug: 235047894
Ignore-AOSP-First: cherry-pick
Change-Id: I6469862134d398bba8e9c738eaba081dc3ee6d65
Merged-In: I770a00dd99abab967590d100607a8b1292dc0492
---
 framework/java/android/bluetooth/BluetoothAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')

diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index e4bfc42b86..0fdadf85eb 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -3364,7 +3364,7 @@ public final class BluetoothAdapter {
      * can use the same UUID to query our SDP server and discover which channel
      * to connect to. This SDP record will be removed when this socket is
      * closed, or if this application closes unexpectedly.
-     * <p>Use {@link BluetoothDevice#createRfcommSocketToServiceRecord} to
+     * <p>Use {@link BluetoothDevice#createInsecureRfcommSocketToServiceRecord} to
      * connect to this socket from another device using the same {@link UUID}.
      *
      * @param name service name for SDP record
-- 
cgit v1.2.3