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

Commit 5fbb8839 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[Pandora] Fix spelling of "connectability""

parents ec6a7848 ca608981

android/pandora/mmi2grpc/mmi2grpc/l2cap.py

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class L2CAPProxy(ProfileProxy): 
        Place the IUT into LE connectable mode.

        """

        self.host.StartAdvertising(

            connectability_mode=ConnectabilityMode.CONECTABILITY_CONNECTABLE,

            connectability_mode=ConnectabilityMode.CONNECTABILITY_CONNECTABLE,

            own_address_type=AddressType.PUBLIC,

        )

        # not strictly necessary, but can save time on waiting connection

android/pandora/mmi2grpc/mmi2grpc/sm.py

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class SMProxy(ProfileProxy): 
        Action: Place the IUT in connectable mode

        """

        self.host.StartAdvertising(

            connectability_mode=ConnectabilityMode.CONECTABILITY_CONNECTABLE,

            connectability_mode=ConnectabilityMode.CONNECTABILITY_CONNECTABLE,

            own_address_type=AddressType.PUBLIC,

        )

        return "OK"

android/pandora/server/proto/pandora_experimental/host.proto

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ enum DiscoverabilityMode { 
enum ConnectabilityMode {

  CONNECTABILITY_UNSPECIFIED = 0;

  CONNECTABILITY_NOT_CONNECTABLE = 1;

  CONECTABILITY_CONNECTABLE = 2;

  CONNECTABILITY_CONNECTABLE = 2;

}



message SetConnectabilityModeRequest {

android/pandora/server/src/com/android/pandora/Host.kt

+3 −3
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ class Host(private val context: Context, private val server: Server) : HostImplB 
          bluetoothAdapter.bluetoothLeAdvertiser.startAdvertising(

            AdvertiseSettings.Builder()

              .setConnectable(

                request.connectabilityMode == ConnectabilityMode.CONECTABILITY_CONNECTABLE

                request.connectabilityMode == ConnectabilityMode.CONNECTABILITY_CONNECTABLE

              )

              .setOwnAddressType(

                when (request.ownAddressType!!) {
@@ -513,7 +513,7 @@ class Host(private val context: Context, private val server: Server) : HostImplB 
          ConnectabilityMode.CONNECTABILITY_NOT_CONNECTABLE -> {

            BluetoothAdapter.SCAN_MODE_NONE

          }

          ConnectabilityMode.CONECTABILITY_CONNECTABLE -> {

          ConnectabilityMode.CONNECTABILITY_CONNECTABLE -> {

            if (

              discoverability == DiscoverabilityMode.DISCOVERABILITY_LIMITED ||

                discoverability == DiscoverabilityMode.DISCOVERABILITY_GENERAL
@@ -545,7 +545,7 @@ class Host(private val context: Context, private val server: Server) : HostImplB 
          DiscoverabilityMode.DISCOVERABILITY_UNSPECIFIED,

          DiscoverabilityMode.UNRECOGNIZED -> null

          DiscoverabilityMode.DISCOVERABILITY_NONE ->

            if (connectability == ConnectabilityMode.CONECTABILITY_CONNECTABLE) {

            if (connectability == ConnectabilityMode.CONNECTABILITY_CONNECTABLE) {

              BluetoothAdapter.SCAN_MODE_CONNECTABLE

            } else {

              BluetoothAdapter.SCAN_MODE_NONE