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

Commit d3373521 authored by skarnataki's avatar skarnataki Committed by Thomas Girardier
Browse files

File changes for 9 AVRCP Test Case execution- 

"AVRCP/TG/CEC/BV-01-I"
"AVRCP/TG/CRC/BV-01-I"
"AVRCP/TG/ICC/BV-01-I"
"AVRCP/TG/ICC/BV-02-I"
"AVRCP/TG/MPS/BV-01-I"
"AVRCP/CT/CEC/BV-02-I"
"AVRCP/CT/CRC/BV-02-I"
"AVRCP/TG/MDI/BV-02-C"
"AVRCP/TG/MPS/BV-02-C"

Bug: 239921180
Test: atest pts-bot:AVRCP -v
Ignore-AOSP-First: Cherry-picked from AOSP
Change-Id: I1bfed3a6ca55ef6e09a4ef4a89a9ff31f4a3f0e1
Merged-In: I1bfed3a6ca55ef6e09a4ef4a89a9ff31f4a3f0e1
parent 6986f60e

android/pandora/mmi2grpc/mmi2grpc/__init__.py

+8 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import sys 
import grpc



from mmi2grpc.a2dp import A2DPProxy

from mmi2grpc.avrcp import AVRCPProxy

from mmi2grpc.gatt import GATTProxy

from mmi2grpc.hfp import HFPProxy

from mmi2grpc.sdp import SDPProxy
@@ -54,6 +55,7 @@ class IUT: 


        # Profile proxies.

        self._a2dp = None

        self._avrcp = None

        self._gatt = None

        self._hfp = None

        self._sdp = None
@@ -68,6 +70,7 @@ class IUT: 


    def __exit__(self, exc_type, exc_value, exc_traceback):

        self._a2dp = None

        self._avrcp = None

        self._gatt = None

        self._hfp = None

        self._sdp = None
@@ -115,6 +118,11 @@ class IUT: 
            if not self._a2dp:

                self._a2dp = A2DPProxy(grpc.insecure_channel(f'localhost:{self.port}'))

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

        # Handles AVRCP and AVCTP MMIs.

        if profile in ('AVRCP', 'AVCTP'):

            if not self._avrcp:

                self._avrcp = AVRCPProxy(grpc.insecure_channel(f'localhost:{self.port}'))

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

        # Handles GATT MMIs.

        if profile in ('GATT'):

            if not self._gatt:

android/pandora/mmi2grpc/mmi2grpc/avrcp.py

0 → 100644
+167 −0
Original line number Diff line number Diff line 
# Copyright 2022 Google LLC

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#     https://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

"""AVRCP proxy module."""



import time

from typing import Optional



from grpc import RpcError



from mmi2grpc._audio import AudioSignal

from mmi2grpc._helpers import assert_description

from mmi2grpc._proxy import ProfileProxy

from pandora.a2dp_grpc import A2DP

from pandora.a2dp_pb2 import Sink, Source

from pandora.avrcp_grpc import AVRCP

from pandora.host_grpc import Host

from pandora.host_pb2 import Connection





class AVRCPProxy(ProfileProxy):

    """AVRCP proxy.



    Implements AVRCP and AVCTP PTS MMIs.

    """



    connection: Optional[Connection] = None

    sink: Optional[Sink] = None

    source: Optional[Source] = None



    def __init__(self, channel):

        super().__init__()



        self.host = Host(channel)

        self.a2dp = A2DP(channel)

        self.avrcp = AVRCP(channel)



    @assert_description

    def TSC_AVDTP_mmi_iut_accept_connect(self, test: str, pts_addr: bytes, **kwargs):

        """

        If necessary, take action to accept the AVDTP Signaling Channel

        Connection initiated by the tester.



        Description: Make sure the IUT

        (Implementation Under Test) is in a state to accept incoming Bluetooth

        connections.  Some devices may need to be on a specific screen, like a

        Bluetooth settings screen, in order to pair with PTS.  If the IUT is

        still having problems pairing with PTS, try running a test case where

        the IUT connects to PTS to establish pairing.



        """

        if "CT" in test:



            self.connection = self.host.WaitConnection(address=pts_addr).connection

            try:

                self.source = self.a2dp.WaitSource(connection=self.connection).source

            except RpcError:

                pass

        else:

            self.connection = self.host.WaitConnection(address=pts_addr).connection

            try:

                self.sink = self.a2dp.WaitSink(connection=self.connection).sink

            except RpcError:

                pass

        return "OK"



    @assert_description

    def TSC_AVCTP_mmi_iut_accept_connect_control(self, **kwargs):

        """

        Please wait while PTS creates an AVCTP control channel connection.

        Action: Make sure the IUT is in a connectable state.



        """

        #TODO: Wait for connection to be established and AVCTP control channel to be open

        return "OK"



    @assert_description

    def TSC_AVCTP_mmi_iut_accept_disconnect_control(self, **kwargs):

        """

        Please wait while PTS disconnects the AVCTP control channel connection.



        """

        return "OK"



    @assert_description

    def TSC_AVRCP_mmi_iut_accept_unit_info(self, **kwargs):

        """

        Take action to send a valid response to the [Unit Info] command sent by

        the PTS.



        """

        return "OK"



    @assert_description

    def TSC_AVRCP_mmi_iut_accept_subunit_info(self, **kwargs):

        """

        Take action to send a valid response to the [Subunit Info] command sent

        by the PTS.



        """

        return "OK"



    @assert_description

    def TSC_AVCTP_mmi_iut_accept_connect_browsing(self, **kwargs):

        """

        Please wait while PTS creates an AVCTP browsing channel connection.

        Action: Make sure the IUT is in a connectable state.



        """

        return "OK"



    @assert_description

    def TSC_AVRCP_mmi_iut_accept_get_folder_items_media_player_list(self, **kwargs):

        """

        Take action to send a valid response to the [Get Folder Items] with the

        scope <Media Player List> command sent by the PTS.



        """

        return "OK"



    @assert_description

    def TSC_AVRCP_mmi_user_confirm_media_players(self, **kwargs):

        """

        Do the following media players exist on the IUT?



        Media Player:

        Bluetooth Player





        Note: Some media players may not be listed above.



        """

        #TODO: Verify the media players available

        return "OK"



    @assert_description

    def TSC_AVP_mmi_iut_initiate_disconnect(self, **kwargs):

        """

        Take action to disconnect all A2DP and/or AVRCP connections.



        """

        if self.connection is None:

            self.connection = self.host.GetConnection(address=pts_addr).connection

        self.host.Disconnect(connection=self.connection)

        self.connection = None

        self.sink = None

        self.source = None

        return "OK"



    @assert_description

    def TSC_AVRCP_mmi_iut_accept_set_addressed_player(self, **kwargs):

        """

        Take action to send a valid response to the [Set Addressed Player]

        command sent by the PTS.



        """

        return "OK"
 
 No newline at end of file

android/pandora/server/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ genrule { 
         "    $(in)",

    srcs: [

        "proto/pandora/a2dp.proto",

        "proto/pandora/avrcp.proto",

        "proto/pandora/gatt.proto",

        "proto/pandora/hfp.proto",

        "proto/pandora/host.proto",
@@ -142,6 +143,8 @@ genrule { 
    out: [

        "pandora/a2dp_grpc.py",

        "pandora/a2dp_pb2.py",

        "pandora/avrcp_grpc.py",

        "pandora/avrcp_pb2.py",

        "pandora/gatt_grpc.py",

        "pandora/gatt_pb2.py",

        "pandora/hfp_grpc.py",

android/pandora/server/configs/PtsBotTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
        <option name="physical" value="false" />

        <option name="profile" value="A2DP/SRC" />

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

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

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

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

        <option name="profile" value="HFP/AG/DIS" />

android/pandora/server/configs/pts_bot_tests_config.json

+62 −1
Original line number Diff line number Diff line
@@ -41,6 +41,15 @@ 
    "AVDTP/SRC/INT/SIG/SMG/BV-31-C",

    "AVDTP/SRC/INT/SIG/SYN/BV-05-C",

    "AVDTP/SRC/INT/TRA/BTR/BV-01-C",

    "AVRCP/TG/CEC/BV-01-I",

    "AVRCP/TG/CRC/BV-01-I",

    "AVRCP/TG/ICC/BV-01-I",

    "AVRCP/TG/ICC/BV-02-I",

    "AVRCP/TG/MPS/BV-01-I",

    "AVRCP/CT/CEC/BV-02-I",

    "AVRCP/CT/CRC/BV-02-I",

    "AVRCP/TG/MDI/BV-02-C",

    "AVRCP/TG/MPS/BV-02-C",

    "GATT/CL/GAC/BV-01-C",

    "GATT/CL/GAD/BV-01-C",

    "GATT/CL/GAD/BV-02-C",
@@ -115,6 +124,58 @@ 
    "AVDTP/SRC/INT/SIG/SMG/BV-13-C",

    "AVDTP/SRC/INT/SIG/SMG/BV-23-C",

    "AVDTP/SRC/INT/SIG/SMG/ESR05/BV-13-C",

    "AVRCP/TG/PTT/BV-01-I",

    "AVRCP/TG/PTT/BV-05-I",

    "AVRCP/TG/MPS/BV-02-I",

    "AVRCP/TG/MPS/BV-03-I",

    "AVRCP/TG/MCN/CB/BV-01-I",

    "AVRCP/TG/MCN/CB/BV-02-I",

    "AVRCP/TG/MCN/CB/BV-03-I",

    "AVRCP/TG/MCN/CB/BV-04-I",

    "AVRCP/TG/MCN/CB/BV-06-I",

    "AVRCP/TG/MCN/NP/BV-01-I",

    "AVRCP/TG/MCN/NP/BV-04-I",

    "AVRCP/TG/MCN/NP/BV-05-I",

    "AVRCP/TG/MCN/NP/BV-06-I",

    "AVRCP/TG/CFG/BV-02-C",

    "AVRCP/TG/CFG/BI-01-C",

    "AVRCP/TG/MDI/BV-04-C",

    "AVRCP/TG/MDI/BV-05-C",

    "AVRCP/TG/CON/BV-04-C",

    "AVRCP/TG/NFY/BV-02-C",

    "AVRCP/TG/NFY/BV-04-C",

    "AVRCP/TG/NFY/BV-06-C",

    "AVRCP/TG/NFY/BV-07-C",

    "AVRCP/TG/NFY/BI-01-C",

    "AVRCP/TG/INV/BI-01-C",

    "AVRCP/TG/INV/BI-02-C",

    "AVRCP/TG/MPS/BI-01-C",

    "AVRCP/TG/MPS/BV-04-C",

    "AVRCP/TG/MPS/BI-02-C",

    "AVRCP/TG/MPS/BV-06-C",

    "AVRCP/TG/MPS/BV-09-C",

    "AVRCP/TG/MCN/CB/BV-02-C",

    "AVRCP/TG/MCN/CB/BI-01-C",

    "AVRCP/TG/MCN/CB/BV-05-C",

    "AVRCP/TG/MCN/CB/BV-06-C",

    "AVRCP/TG/MCN/CB/BI-04-C",

    "AVRCP/TG/MCN/CB/BI-02-C",

    "AVRCP/TG/MCN/CB/BV-08-C",

    "AVRCP/TG/MCN/CB/BV-09-C",

    "AVRCP/TG/MCN/CB/BI-05-C",

    "AVRCP/TG/MCN/CB/BI-03-C",

    "AVRCP/TG/MCN/NP/BV-02-C",

    "AVRCP/TG/MCN/NP/BI-01-C",

    "AVRCP/TG/MCN/NP/BV-06-C",

    "AVRCP/TG/MCN/NP/BV-07-C",

    "AVRCP/TG/MCN/NP/BV-09-C",

    "AVRCP/TG/RCR/BV-02-C",

    "AVRCP/TG/RCR/BV-04-C",

    "AVRCP/CT/PTT/BV-01-I",

    "AVRCP/CT/PTH/BV-01-C",

    "AVRCP/CT/CRC/BV-01-I",

    "AVRCP/TG/CRC/BV-02-I",

    "AVRCP/CT/CEC/BV-01-I",

    "HFP/AG/SLC/BV-01-C",

    "HFP/AG/SLC/BV-02-C",

    "HFP/AG/SLC/BV-03-C",