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

Commit 9f96f2fb authored by David Duarte's avatar David Duarte Committed by Gerrit Code Review
Browse files

Merge "framework: Apply common typos suggestions" into main

parents aa9a114d 1c07fc74

framework/java/android/bluetooth/BluetoothAdapter.java

+8 −8
Original line number Diff line number Diff line
@@ -1303,7 +1303,7 @@ public final class BluetoothAdapter { 
     * <p>If the internal Adapter state is STATE_BLE_ON, this would trigger the transition to

     * STATE_OFF and completely shut-down Bluetooth

     *

     * <p>If the Adapter state is STATE_ON, This would unregister the existance of special Bluetooth

     * <p>If the Adapter state is STATE_ON, This would unregister the existence of special Bluetooth

     * LE application and hence the further turning off of Bluetooth from UI would ensure the

     * complete turn-off of Bluetooth rather than staying back BLE only state

     *
@@ -1311,7 +1311,7 @@ public final class BluetoothAdapter { 
     * {@link #ACTION_BLE_STATE_CHANGED} to be notified of subsequent adapter state changes If this

     * call returns true, then the adapter state will immediately transition from {@link #STATE_ON}

     * to {@link #STATE_TURNING_OFF}, and some time later transition to either {@link #STATE_BLE_ON}

     * or {@link #STATE_OFF} based on the existance of the further Always BLE ON enabled

     * or {@link #STATE_OFF} based on the existence of the further Always BLE ON enabled

     * applications If this call returns false then there was an immediate problem that will prevent

     * the QAdapter from being turned off - such as the QAadapter already being turned off.

     *
@@ -2698,7 +2698,7 @@ public final class BluetoothAdapter { 
     * feature is supported, {@link BluetoothStatusCodes#FEATURE_NOT_SUPPORTED} if the feature is

     * not supported, or an error code.

     *

     * @return whether the LE audio broadcast assistent is supported

     * @return whether the LE audio broadcast assistant is supported

     * @throws IllegalStateException if the bluetooth service is null

     */

    @RequiresNoPermission
@@ -3429,7 +3429,7 @@ public final class BluetoothAdapter { 
    /**

     * Create a listening, insecure RFCOMM Bluetooth socket with Service Record.

     *

     * <p>The link key is not required to be authenticated, i.e the communication may be vulnerable

     * <p>The link key is not required to be authenticated, i.e. the communication may be vulnerable

     * to Person In the Middle attacks. For Bluetooth 2.1 devices, the link will be encrypted, as

     * encryption is mandatory. For legacy devices (pre Bluetooth 2.1 devices) the link will not be

     * encrypted. Use {@link #listenUsingRfcommWithServiceRecord}, if an encrypted and authenticated
@@ -3466,7 +3466,7 @@ public final class BluetoothAdapter { 
    /**

     * Create a listening, encrypted, RFCOMM Bluetooth socket with Service Record.

     *

     * <p>The link will be encrypted, but the link key is not required to be authenticated i.e the

     * <p>The link will be encrypted, but the link key is not required to be authenticated i.e. the

     * communication is vulnerable to Person In the Middle attacks. Use {@link

     * #listenUsingRfcommWithServiceRecord}, to ensure an authenticated link key.

     *
@@ -4048,7 +4048,7 @@ public final class BluetoothAdapter { 
        /**

         * Wrapper function to relay to the {@link OobDataCallback#onError}

         *

         * @param errorCode - the code descibing the type of error that occurred.

         * @param errorCode - the code describing the type of error that occurred.

         * @hide

         */

        public void onError(@OobError int errorCode) {
@@ -4568,7 +4568,7 @@ public final class BluetoothAdapter { 
     * assign a dynamic PSM value. This socket can be used to listen for incoming connections. The

     * supported Bluetooth transport is LE only.

     *

     * <p>The link key is not required to be authenticated, i.e the communication may be vulnerable

     * <p>The link key is not required to be authenticated, i.e. the communication may be vulnerable

     * to person-in-the-middle attacks. Use {@link #listenUsingL2capChannel}, if an encrypted and

     * authenticated communication channel is desired.

     *
@@ -4679,7 +4679,7 @@ public final class BluetoothAdapter { 
                    // Check whether this device is already registered by the listener

                    if (listenerList.stream().anyMatch((pair) -> (pair.first.equals(listener)))) {

                        throw new IllegalArgumentException(

                                "listener was already regestered" + " for the device");

                                "listener was already registered" + " for the device");

                    }

                }

framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
         *

         * @param groupId group identifier

         * @param opStatus status of lock operation

         * @param isLocked inidcates if group is locked

         * @param isLocked indicates if group is locked

         * @hide

         */

        @SystemApi

framework/java/android/bluetooth/BluetoothDevice.java

+6 −6
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @SystemApi public static final int METADATA_UNTETHERED_LEFT_BATTERY = 10;



    /**

     * Battery level of rigth headset Data type should be {@String} 0-100 as {@link Byte} array,

     * Battery level of right headset Data type should be {@String} 0-100 as {@link Byte} array,

     * otherwise as invalid.

     *

     * @hide
@@ -983,7 +983,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
            "android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL";



    /**

     * Intent to broadcast silence mode changed. Alway contains the extra field {@link

     * Intent to broadcast silence mode changed. Always contains the extra field {@link

     * #EXTRA_DEVICE}

     *

     * @hide
@@ -1332,7 +1332,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    /** Address is either resolvable, non-resolvable or static. */

    public static final int ADDRESS_TYPE_RANDOM = 1;



    /** Address type is unknown or unavailable * */

    /** Address type is unknown or unavailable */

    public static final int ADDRESS_TYPE_UNKNOWN = 0xFFFF;



    private static final String NULL_MAC_ADDRESS = "00:00:00:00:00:00";
@@ -3025,7 +3025,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
     * Create an RFCOMM {@link BluetoothSocket} socket ready to start an insecure outgoing

     * connection to this remote device using SDP lookup of uuid.

     *

     * <p>The communication channel will not have an authenticated link key i.e it will be subject

     * <p>The communication channel will not have an authenticated link key i.e. it will be subject

     * to person-in-the-middle attacks. For Bluetooth 2.1 devices, the link key will be encrypted,

     * as encryption is mandatory. For legacy devices (pre Bluetooth 2.1 devices) the link key will

     * be not be encrypted. Use {@link #createRfcommSocketToServiceRecord} if an encrypted and
@@ -3440,7 +3440,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    }



    /**

     * Get the maxinum metadata key ID.

     * Get the maximum metadata key ID.

     *

     * @return the last supported metadata key

     * @hide
@@ -3570,7 +3570,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
     *

     * <p>This API will throw an exception if the feature is not supported but still invoked.

     *

     * <p>This API will return null if 1. The bleutooth service is not started yet, 2. It is invoked

     * <p>This API will return null if 1. The bluetooth service is not started yet, 2. It is invoked

     * for a device which is not bonded, or 3. The used transport, for example, HFP Client profile

     * is not enabled or connected yet.

     *

framework/java/android/bluetooth/BluetoothFrameworkInitializer.java

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class BluetoothFrameworkInitializer { 


    /**

     * Called by {@link ActivityThread}'s static initializer to set the callback enabling Bluetooth

     * {@link BinderCallsStats} registeration.

     * {@link BinderCallsStats} registration.

     *

     * @param binderCallsStatsConsumer called by bluetooth service to create a new binder calls

     *     stats observer

framework/java/android/bluetooth/BluetoothGattCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ public abstract class BluetoothGattCallback { 
     * Callback indicating the result of a descriptor write operation.

     *

     * @param gatt GATT client invoked {@link BluetoothGatt#writeDescriptor}

     * @param descriptor Descriptor that was writte to the associated remote device.

     * @param descriptor Descriptor that was written to the associated remote device.

     * @param status The result of the write operation {@link BluetoothGatt#GATT_SUCCESS} if the

     *     operation succeeds.

     */