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

Commit 883c239a authored by Thomas Girardier's avatar Thomas Girardier Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L79300000956516311:N67600001297819102"... 

Merge changes from topic "cherrypicker-L79300000956516311:N67600001297819102" into tm-qpr-dev am: e521730c

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



Change-Id: Iddeb505f850a0ed18084e2a5ef185a2929008689
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c57d96e5 e521730c

android/pandora/mmi2grpc/mmi2grpc/__init__.py

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import grpc 
from mmi2grpc.a2dp import A2DPProxy

from mmi2grpc.avrcp import AVRCPProxy

from mmi2grpc.gatt import GATTProxy

from mmi2grpc.gap import GAPProxy

from mmi2grpc.hfp import HFPProxy

from mmi2grpc.hid import HIDProxy

from mmi2grpc.hogp import HOGPProxy
@@ -65,6 +66,7 @@ class IUT: 
        self._a2dp = None

        self._avrcp = None

        self._gatt = None

        self._gap = None

        self._hfp = None

        self._hid = None

        self._hogp = None
@@ -89,6 +91,7 @@ class IUT: 
        self._a2dp = None

        self._avrcp = None

        self._gatt = None

        self._gap = None

        self._hfp = None

        self._l2cap = None

        self._hid = None
@@ -164,6 +167,11 @@ class IUT: 
            if not self._gatt:

                self._gatt = GATTProxy(grpc.insecure_channel(f'localhost:{self.pandora_server_port}'))

            return self._gatt.interact(test, interaction, description, pts_address)

        # Handles GAP MMIs.

        if profile in ('GAP'):

            if not self._gap:

                self._gap = GAPProxy(grpc.insecure_channel(f'localhost:{self.pandora_server_port}'))

            return self._gap.interact(test, interaction, description, pts_address)

        # Handles HFP MMIs.

        if profile in ('HFP'):

            if not self._hfp:

android/pandora/mmi2grpc/mmi2grpc/gap.py

0 → 100644
+913 −0

File added.

Preview size limit exceeded, changes collapsed.

android/pandora/mmi2grpc/mmi2grpc/gatt.py

+14 −15
Original line number Diff line number Diff line
@@ -20,11 +20,10 @@ from mmi2grpc._proxy import ProfileProxy 


from pandora_experimental.gatt_grpc import GATT

from pandora_experimental.host_grpc import Host

from pandora_experimental.host_pb2 import Connection, ConnectabilityMode, AddressType

from pandora_experimental.host_pb2 import ConnectabilityMode, AddressType

from pandora_experimental.gatt_pb2 import AttStatusCode, AttProperties, AttPermissions

from pandora_experimental.gatt_pb2 import GattService

from pandora_experimental.gatt_pb2 import GattCharacteristic

from pandora_experimental.gatt_pb2 import GattCharacteristicDescriptor

from pandora_experimental.gatt_pb2 import GattServiceParams

from pandora_experimental.gatt_pb2 import GattCharacteristicParams

from pandora_experimental.gatt_pb2 import ReadCharacteristicResponse

from pandora_experimental.gatt_pb2 import ReadCharacteristicsFromUuidResponse
@@ -901,15 +900,15 @@ class GATTProxy(ProfileProxy): 
            own_address_type=AddressType.PUBLIC,

        )

        self.gatt.RegisterService(

            service=GattService(

            service=GattServiceParams(

                uuid=BASE_READ_WRITE_SERVICE_UUID,

                characteristics=[

                    GattCharacteristic(

                    GattCharacteristicParams(

                        uuid=BASE_READ_CHARACTERISTIC_UUID,

                        properties=AttProperties.PROPERTY_READ,

                        permissions=AttPermissions.PERMISSION_READ,

                    ),

                    GattCharacteristic(

                    GattCharacteristicParams(

                        uuid=BASE_WRITE_CHARACTERISTIC_UUID,

                        properties=AttProperties.PROPERTY_WRITE,

                        permissions=AttPermissions.PERMISSION_WRITE,
@@ -986,10 +985,10 @@ class GATTProxy(ProfileProxy): 
        """



        self.last_added_service = self.gatt.RegisterService(

            service=GattService(

            service=GattServiceParams(

                uuid=CUSTOM_SERVICE_UUID,

                characteristics=[

                    GattCharacteristic(

                    GattCharacteristicParams(

                        uuid=CUSTOM_CHARACTERISTIC_UUID,

                        properties=AttProperties.PROPERTY_READ,

                        permissions=AttPermissions.PERMISSION_NONE,
@@ -1030,10 +1029,10 @@ class GATTProxy(ProfileProxy): 
        """



        self.last_added_service = self.gatt.RegisterService(

            service=GattService(

            service=GattServiceParams(

                uuid=CUSTOM_SERVICE_UUID,

                characteristics=[

                    GattCharacteristic(

                    GattCharacteristicParams(

                        uuid=CUSTOM_CHARACTERISTIC_UUID,

                        properties=AttProperties.PROPERTY_READ,

                        permissions=AttPermissions.PERMISSION_READ_ENCRYPTED,
@@ -1063,10 +1062,10 @@ class GATTProxy(ProfileProxy): 
        """



        self.last_added_service = self.gatt.RegisterService(

            service=GattService(

            service=GattServiceParams(

                uuid=CUSTOM_SERVICE_UUID,

                characteristics=[

                    GattCharacteristic(

                    GattCharacteristicParams(

                        uuid=CUSTOM_CHARACTERISTIC_UUID,

                        properties=AttProperties.PROPERTY_READ,

                        permissions=AttPermissions.PERMISSION_NONE,
@@ -1096,10 +1095,10 @@ class GATTProxy(ProfileProxy): 
        """



        self.last_added_service = self.gatt.RegisterService(

            service=GattService(

            service=GattServiceParams(

                uuid=CUSTOM_SERVICE_UUID,

                characteristics=[

                    GattCharacteristic(

                    GattCharacteristicParams(

                        uuid=CUSTOM_CHARACTERISTIC_UUID,

                        properties=AttProperties.PROPERTY_WRITE,

                        permissions=AttPermissions.PERMISSION_NONE,

android/pandora/server/configs/PtsBotTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
        <option name="profile" value="AVDTP/SRC" />

        <option name="profile" value="AVDTP/SNK" />

        <option name="profile" value="AVRCP" />

        <option name="profile" value="GAP" />

        <option name="profile" value="GATT/CL/GAC" />

        <option name="profile" value="GATT/CL/GAD" />

        <option name="profile" value="GATT/CL/GAR" />

android/pandora/server/configs/PtsBotTestMts.xml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
        <option name="profile" value="AVDTP/SRC" />

        <option name="profile" value="AVDTP/SNK" />

        <option name="profile" value="AVRCP" />

        <option name="profile" value="GAP" />

        <option name="profile" value="GATT/CL/GAC" />

        <option name="profile" value="GATT/CL/GAD" />

        <option name="profile" value="GATT/CL/GAR" />