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

Commit c1601b03 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Various typo fix" into main

parents 94ebd4ec ad88b428

android/pandora/server/src/Gatt.kt

+2 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ class Gatt(private val context: Context) : GATTImplBase(), Closeable { 
    private val serverManager by lazy { GattServerManager(mBluetoothManager, context, mScope) }



    private val flow: Flow<Intent>



    init {

        val intentFilter = IntentFilter()

        intentFilter.addAction(BluetoothDevice.ACTION_UUID)
@@ -128,7 +129,7 @@ class Gatt(private val context: Context) : GATTImplBase(), Closeable { 
            // we need to wait until the service discovery is finished to be able to discover again.

            // This takes between 20s and 28s, and there is no way to know if the service is busy or

            // not.

            // Delay was originally 30s, but due to flakyness increased to 32s.

            // Delay was originally 30s, but due to flakiness increased to 32s.

            delay(32000L)

            check(gattInstance.mGatt.discoverServiceByUuid(UUID.fromString(request.uuid)))

            // BluetoothGatt#discoverServiceByUuid does not trigger any callback and does not return

framework/tests/bumble/doc/guide.md

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ First, create your file under `p/m/Blueooth/frameworks/bumble/src/android/blueto 


```shell

cd p/m/Bluetooth/frameworks/bumble/src/android/bluetooth

touch DckTest.kt # We usualy name our test file <test_suite_name>Test.kt/.java

touch DckTest.kt # We usually name our test file <test_suite_name>Test.kt/.java

```



Then add the minimum requirements:

pandora/interfaces/pandora_experimental/hfp.proto

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ service HFP { 
  rpc DeclineCallAsHandsfree(DeclineCallAsHandsfreeRequest) returns (DeclineCallAsHandsfreeResponse);

  // Connect to an incoming audio stream from a peer device (as a handsfree)

  rpc ConnectToAudioAsHandsfree(ConnectToAudioAsHandsfreeRequest) returns (ConnectToAudioAsHandsfreeResponse);

  // Disonnect from an incoming audio stream from a peer device (as a handsfree)

  // Disconnect from an incoming audio stream from a peer device (as a handsfree)

  rpc DisconnectFromAudioAsHandsfree(DisconnectFromAudioAsHandsfreeRequest) returns (DisconnectFromAudioAsHandsfreeResponse);

  // Make a call to a given phone number (as a handsfree)

  rpc MakeCallAsHandsfree(MakeCallAsHandsfreeRequest) returns (MakeCallAsHandsfreeResponse);

system/bta/gatt/bta_gattc_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ void BTA_GATTC_ReadCharDescr(uint16_t conn_id, uint16_t handle, tGATT_AUTH_REQ a 
 * Description      This function is called to read multiple characteristic or

 *                  characteristic descriptors.

 *

 * Parameters       conn_id - connectino ID.

 * Parameters       conn_id - connection ID.

 *                  p_read_multi - pointer to the read multiple parameter.

 *                  variable_len - whether "read multi variable length" variant

 *                                 shall be used.

system/bta/include/bta_gatt_api.h

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ void BTA_GATTC_ExecuteWrite(uint16_t conn_id, bool is_execute); 
 * Description      This function is called to read multiple characteristic or

 *                  characteristic descriptors.

 *

 * Parameters       conn_id - connectino ID.

 * Parameters       conn_id - connection ID.

 *                  p_read_multi - read multiple parameters.

 *                  variable_len - whether "read multi variable length" variant

 *                                 shall be used.