Merge "Fix typos in variable names, comments, and documentation strings" into main am: 6e3bf6aff1 am: cc9d0501fa

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

Change-Id: I1620f3bc59ca1e8b113ed529add35da1f2fe2e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

12 files changed, 23 insertions, 23 deletions

diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index 35acdb959d..a432fc7fbc 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -1125,7 +1125,7 @@ public final class BluetoothAdapter {
 
         mServiceLock.writeLock().lock();
         try {
-            mService = registerBlueoothManagerCallback(mManagerCallback);
+            mService = registerBluetoothManagerCallback(mManagerCallback);
         } finally {
             mServiceLock.writeLock().unlock();
         }
@@ -1922,7 +1922,7 @@ public final class BluetoothAdapter {
     }
 
     /**
-     * Set the local Bluetooth adapter connectablility and discoverability.
+     * Set the local Bluetooth adapter connectability and discoverability.
      *
      * <p>If the scan mode is set to {@link #SCAN_MODE_CONNECTABLE_DISCOVERABLE}, it will change to
      * {@link #SCAN_MODE_CONNECTABLE} after the discoverable timeout. The discoverable timeout can
@@ -4006,7 +4006,7 @@ public final class BluetoothAdapter {
      * <p>For example, this secret can be transferred to a remote device out of band (meaning any
      * other way besides using bluetooth). Once the remote device finds this device using the
      * information given in the data, such as the PUBLIC ADDRESS, the remote device could then
-     * connect to this device using this secret when the pairing sequenece asks for the secret. This
+     * connect to this device using this secret when the pairing sequence asks for the secret. This
      * device will respond by automatically accepting the pairing due to the secret being so
      * trustworthy.
      *
@@ -4145,7 +4145,7 @@ public final class BluetoothAdapter {
     }
 
     /** Registers a IBluetoothManagerCallback and returns the cached service proxy object. */
-    IBluetooth registerBlueoothManagerCallback(IBluetoothManagerCallback cb) {
+    IBluetooth registerBluetoothManagerCallback(IBluetoothManagerCallback cb) {
         requireNonNull(cb);
         if (Flags.getProfileUseLock()) {
             sServiceLock.writeLock().lock();
@@ -4795,7 +4795,7 @@ public final class BluetoothAdapter {
      * Unregister a {@link #OnMetadataChangedListener} from a registered {@link BluetoothDevice}.
      * Unregistration can be done when Bluetooth is either ON or OFF. {@link
      * #addOnMetadataChangedListener(OnMetadataChangedListener, BluetoothDevice, Executor)} must be
-     * called before unregisteration.
+     * called before unregistration.
      *
      * @param device {@link BluetoothDevice} that will be unregistered. It should not be null or
      *     {@link NullPointerException} will be triggered.
@@ -5046,7 +5046,7 @@ public final class BluetoothAdapter {
 
     /**
      * Sets the preferred profiles for each audio mode for system routed audio. The audio framework
-     * and Telecomm will read this preference when routing system managed audio. Not supplying an
+     * and Telecom will read this preference when routing system managed audio. Not supplying an
      * audio mode in the Bundle will reset that audio mode to the default profile preference for
      * that mode (e.g. an empty Bundle resets all audio modes to their default profiles).
      *
diff --git a/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java b/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java
index 79227e1bbe..25ca8d5031 100644
--- a/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java
+++ b/framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java
@@ -83,7 +83,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto
         @interface Status {}
 
         /**
-         * Callback is invoken as a result on {@link #groupLock()}.
+         * Callback is invoked as a result on {@link #groupLock()}.
          *
          * @param groupId group identifier
          * @param opStatus status of lock operation
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java
index 8d93474e1e..a27394acdf 100644
--- a/framework/java/android/bluetooth/BluetoothDevice.java
+++ b/framework/java/android/bluetooth/BluetoothDevice.java
@@ -850,7 +850,7 @@ public final class BluetoothDevice implements Parcelable, Attributable {
     public static final int METADATA_SPATIAL_AUDIO = 24;
 
     /**
-     * The metadata of the Fast Pair for any custmized feature. Data type should be {@link Byte}
+     * The metadata of the Fast Pair for any customized feature. Data type should be {@link Byte}
      * array.
      *
      * @hide
diff --git a/framework/java/android/bluetooth/BluetoothGattCharacteristic.java b/framework/java/android/bluetooth/BluetoothGattCharacteristic.java
index a6b4b96c91..9d7a95236b 100644
--- a/framework/java/android/bluetooth/BluetoothGattCharacteristic.java
+++ b/framework/java/android/bluetooth/BluetoothGattCharacteristic.java
@@ -349,7 +349,7 @@ public class BluetoothGattCharacteristic implements Parcelable {
      * Returns the instance ID for this characteristic.
      *
      * <p>If a remote device offers multiple characteristics with the same UUID, the instance ID is
-     * used to distuinguish between characteristics.
+     * used to distinguish between characteristics.
      *
      * @return Instance ID of this characteristic
      */
diff --git a/framework/java/android/bluetooth/BluetoothGattDescriptor.java b/framework/java/android/bluetooth/BluetoothGattDescriptor.java
index fe77740f0f..fcd6e305e2 100644
--- a/framework/java/android/bluetooth/BluetoothGattDescriptor.java
+++ b/framework/java/android/bluetooth/BluetoothGattDescriptor.java
@@ -39,7 +39,7 @@ public class BluetoothGattDescriptor implements Parcelable {
     /** Value used to enable indication for a client configuration descriptor */
     public static final byte[] ENABLE_INDICATION_VALUE = {0x02, 0x00};
 
-    /** Value used to disable notifications or indicatinos */
+    /** Value used to disable notifications or indications */
     public static final byte[] DISABLE_NOTIFICATION_VALUE = {0x00, 0x00};
 
     /** Descriptor read permission */
@@ -197,7 +197,7 @@ public class BluetoothGattDescriptor implements Parcelable {
      * Returns the instance ID for this descriptor.
      *
      * <p>If a remote device offers multiple descriptors with the same UUID, the instance ID is used
-     * to distuinguish between descriptors.
+     * to distinguish between descriptors.
      *
      * @return Instance ID of this descriptor
      * @hide
diff --git a/framework/java/android/bluetooth/BluetoothGattIncludedService.java b/framework/java/android/bluetooth/BluetoothGattIncludedService.java
index d711073ed6..ac4e92f906 100644
--- a/framework/java/android/bluetooth/BluetoothGattIncludedService.java
+++ b/framework/java/android/bluetooth/BluetoothGattIncludedService.java
@@ -87,7 +87,7 @@ public class BluetoothGattIncludedService implements Parcelable {
      * Returns the instance ID for this service
      *
      * <p>If a remote device offers multiple services with the same UUID (ex. multiple battery
-     * services for different batteries), the instance ID is used to distuinguish services.
+     * services for different batteries), the instance ID is used to distinguish services.
      *
      * @return Instance ID of this service
      */
diff --git a/framework/java/android/bluetooth/BluetoothGattService.java b/framework/java/android/bluetooth/BluetoothGattService.java
index 0461631085..f5c82313fa 100644
--- a/framework/java/android/bluetooth/BluetoothGattService.java
+++ b/framework/java/android/bluetooth/BluetoothGattService.java
@@ -293,7 +293,7 @@ public class BluetoothGattService implements Parcelable {
      * Returns the instance ID for this service
      *
      * <p>If a remote device offers multiple services with the same UUID (ex. multiple battery
-     * services for different batteries), the instance ID is used to distuinguish services.
+     * services for different batteries), the instance ID is used to distinguish services.
      *
      * @return Instance ID of this service
      */
diff --git a/framework/java/android/bluetooth/BluetoothHidHost.java b/framework/java/android/bluetooth/BluetoothHidHost.java
index 550266a8e7..6ab4843cb0 100644
--- a/framework/java/android/bluetooth/BluetoothHidHost.java
+++ b/framework/java/android/bluetooth/BluetoothHidHost.java
@@ -790,7 +790,7 @@ public final class BluetoothHidHost implements BluetoothProfile {
     @RequiresBluetoothConnectPermission
     @RequiresPermission(BLUETOOTH_CONNECT)
     public boolean getIdleTime(BluetoothDevice device) {
-        if (DBG) log("getIdletime(" + device + ")");
+        if (DBG) log("getIdleTime(" + device + ")");
         final IBluetoothHidHost service = getService();
         if (service == null) {
             Log.w(TAG, "Proxy not attached to service");
@@ -817,7 +817,7 @@ public final class BluetoothHidHost implements BluetoothProfile {
     @RequiresBluetoothConnectPermission
     @RequiresPermission(BLUETOOTH_CONNECT)
     public boolean setIdleTime(BluetoothDevice device, byte idleTime) {
-        if (DBG) log("setIdletime(" + device + "), idleTime=" + idleTime);
+        if (DBG) log("setIdleTime(" + device + "), idleTime=" + idleTime);
         final IBluetoothHidHost service = getService();
         if (service == null) {
             Log.w(TAG, "Proxy not attached to service");
diff --git a/framework/java/android/bluetooth/BluetoothUtils.java b/framework/java/android/bluetooth/BluetoothUtils.java
index b734ff2fef..c116639c34 100644
--- a/framework/java/android/bluetooth/BluetoothUtils.java
+++ b/framework/java/android/bluetooth/BluetoothUtils.java
@@ -41,7 +41,7 @@ public final class BluetoothUtils {
     /** This utility class cannot be instantiated */
     private BluetoothUtils() {}
 
-    /** Match with UserHandl.NULL but accessible inside bluetooth package */
+    /** Match with UserHandle.NULL but accessible inside bluetooth package */
     public static final UserHandle USER_HANDLE_NULL = UserHandle.of(-10000);
 
     /** Class for Length-Value-Entry array parsing */
diff --git a/framework/java/android/bluetooth/OobData.java b/framework/java/android/bluetooth/OobData.java
index 4061290886..8ea295ceef 100644
--- a/framework/java/android/bluetooth/OobData.java
+++ b/framework/java/android/bluetooth/OobData.java
@@ -302,7 +302,7 @@ public final class OobData implements Parcelable {
          *     A 1.8 for a detailed description.
          * @return {@link OobData#Builder}
          * @throws IllegalArgumentException if the leTemporaryKey is an invalid format.
-         * @throws NullinterException if leTemporaryKey is null.
+         * @throws NullPointerException if leTemporaryKey is null.
          * @hide
          */
         @NonNull
diff --git a/framework/java/android/bluetooth/le/AdvertisingSetParameters.java b/framework/java/android/bluetooth/le/AdvertisingSetParameters.java
index 9c27e48567..b8fa11c55b 100644
--- a/framework/java/android/bluetooth/le/AdvertisingSetParameters.java
+++ b/framework/java/android/bluetooth/le/AdvertisingSetParameters.java
@@ -116,7 +116,7 @@ public final class AdvertisingSetParameters implements Parcelable {
     @SystemApi public static final int ADDRESS_TYPE_PUBLIC = 0;
 
     /**
-     * Generate and adverise own resolvable private address.
+     * Generate and advertise own resolvable private address.
      *
      * @hide
      */
diff --git a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java
index fafbd27a71..5882968da5 100644
--- a/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java
+++ b/framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java
@@ -281,7 +281,7 @@ public final class BluetoothLeAdvertiser {
      *     three bytes will be added for flags.
      * @param scanResponse Scan response associated with the advertisement data. Size must not
      *     exceed {@link BluetoothAdapter#getLeMaximumAdvertisingDataLength}.
-     * @param periodicParameters periodic advertisng parameters. If null, periodic advertising will
+     * @param periodicParameters periodic advertising parameters. If null, periodic advertising will
      *     not be started.
      * @param periodicData Periodic advertising data. Size must not exceed {@link
      *     BluetoothAdapter#getLeMaximumAdvertisingDataLength}.
@@ -331,7 +331,7 @@ public final class BluetoothLeAdvertiser {
      *     three bytes will be added for flags.
      * @param scanResponse Scan response associated with the advertisement data. Size must not
      *     exceed {@link BluetoothAdapter#getLeMaximumAdvertisingDataLength}.
-     * @param periodicParameters periodic advertisng parameters. If null, periodic advertising will
+     * @param periodicParameters periodic advertising parameters. If null, periodic advertising will
      *     not be started.
      * @param periodicData Periodic advertising data. Size must not exceed {@link
      *     BluetoothAdapter#getLeMaximumAdvertisingDataLength}.
@@ -383,7 +383,7 @@ public final class BluetoothLeAdvertiser {
      *     three bytes will be added for flags.
      * @param scanResponse Scan response associated with the advertisement data. Size must not
      *     exceed {@link BluetoothAdapter#getLeMaximumAdvertisingDataLength}.
-     * @param periodicParameters periodic advertisng parameters. If null, periodic advertising will
+     * @param periodicParameters periodic advertising parameters. If null, periodic advertising will
      *     not be started.
      * @param periodicData Periodic advertising data. Size must not exceed {@link
      *     BluetoothAdapter#getLeMaximumAdvertisingDataLength}.
@@ -440,7 +440,7 @@ public final class BluetoothLeAdvertiser {
      *     three bytes will be added for flags.
      * @param scanResponse Scan response associated with the advertisement data. Size must not
      *     exceed {@link BluetoothAdapter#getLeMaximumAdvertisingDataLength}
-     * @param periodicParameters Periodic advertisng parameters. If null, periodic advertising will
+     * @param periodicParameters Periodic advertising parameters. If null, periodic advertising will
      *     not be started.
      * @param periodicData Periodic advertising data. Size must not exceed {@link
      *     BluetoothAdapter#getLeMaximumAdvertisingDataLength}
@@ -507,7 +507,7 @@ public final class BluetoothLeAdvertiser {
      *     three bytes will be added for flags.
      * @param scanResponse Scan response associated with the advertisement data. Size must not
      *     exceed {@link BluetoothAdapter#getLeMaximumAdvertisingDataLength}
-     * @param periodicParameters Periodic advertisng parameters. If null, periodic advertising will
+     * @param periodicParameters Periodic advertising parameters. If null, periodic advertising will
      *     not be started.
      * @param periodicData Periodic advertising data. Size must not exceed {@link
      *     BluetoothAdapter#getLeMaximumAdvertisingDataLength}