Merge TP1A.220310.002

Change-Id: If2f3a2a6833c45ec4c0cba7c7e668a487938cb92

1 files changed, 3 insertions, 11 deletions

diff --git a/framework/java/android/bluetooth/BluetoothMapClient.java b/framework/java/android/bluetooth/BluetoothMapClient.java
index b29d7b0413..be3e48a0d9 100644
--- a/framework/java/android/bluetooth/BluetoothMapClient.java
+++ b/framework/java/android/bluetooth/BluetoothMapClient.java
@@ -340,9 +340,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable
     }
 
     /**
-     * Get the list of connected devices. Currently at most one.
-     *
-     * @return list of connected devices
+     * {@inheritDoc}
      * @hide
      */
     @SystemApi
@@ -378,10 +376,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable
     }
 
     /**
-     * Get the list of devices matching specified states. Currently at most one.
-     *
-     * @param states The connection states to match for.
-     * @return list of matching devices
+     * {@inheritDoc}
      * @hide
      */
     @SystemApi
@@ -418,10 +413,7 @@ public final class BluetoothMapClient implements BluetoothProfile, AutoCloseable
     }
 
     /**
-     * Get connection state of device
-     *
-     * @param device The remote device whose connection state is to be ascertained.
-     * @return device connection state
+     * {@inheritDoc}
      * @hide
      */
     @SystemApi