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

Commit f5d76cbb authored by uael's avatar uael
Browse files

pandora: gather finalized & experimental APIs 

* remove host & security APIs duplication
* allow the use of both `pandora` & `pandora_experimental` together

Bug: 268215362
Test: None
Change-Id: I21a9d9f896c4d0e330d5f01e518070ace56d29b9
parent f71fe1c1

android/pandora/mmi2grpc/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ filegroup { 
    name: "mmi2grpc",

    srcs: [

        "mmi2grpc/*.py",

        "pandora/*.py",

        ":pandora-python-src",

        ":pandora_experimental-python-src",

    ],

}

android/pandora/mmi2grpc/mmi2grpc/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ from mmi2grpc._helpers import format_proxy 
from mmi2grpc._rootcanal import RootCanal

from mmi2grpc._modem import Modem



from pandora_experimental.host_grpc import Host

from pandora.host_grpc import Host



PANDORA_SERVER_PORT = 8999

ROOTCANAL_CONTROL_PORT = 6212

android/pandora/mmi2grpc/mmi2grpc/a2dp.py

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ from mmi2grpc._helpers import assert_description 
from mmi2grpc._proxy import ProfileProxy

from pandora_experimental.a2dp_grpc import A2DP

from pandora_experimental.a2dp_pb2 import Sink, Source, PlaybackAudioRequest

from pandora_experimental.host_grpc import Host

from pandora_experimental.host_pb2 import Connection

from pandora.host_grpc import Host

from pandora.host_pb2 import Connection



AUDIO_SIGNAL_AMPLITUDE = 0.8

AUDIO_SIGNAL_SAMPLING_RATE = 44100

android/pandora/mmi2grpc/mmi2grpc/avrcp.py

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ from mmi2grpc._proxy import ProfileProxy 
from pandora_experimental.a2dp_grpc import A2DP

from pandora_experimental.a2dp_pb2 import Sink, Source

from pandora_experimental.avrcp_grpc import AVRCP

from pandora_experimental.host_grpc import Host

from pandora_experimental.host_pb2 import Connection

from pandora.host_grpc import Host

from pandora.host_pb2 import Connection

from pandora_experimental.mediaplayer_grpc import MediaPlayer

android/pandora/mmi2grpc/mmi2grpc/gap.py

+4 −4
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ from time import sleep 


from pandora_experimental.gatt_grpc import GATT

from pandora_experimental.gatt_pb2 import GattServiceParams, GattCharacteristicParams

from pandora_experimental.host_grpc import Host

from pandora_experimental.host_pb2 import ConnectabilityMode, DataTypes, DiscoverabilityMode, OwnAddressType

from pandora_experimental.security_grpc import Security, SecurityStorage, PairingEventAnswer

from pandora_experimental.security_pb2 import LESecurityLevel

from pandora.host_grpc import Host

from pandora.host_pb2 import ConnectabilityMode, DataTypes, DiscoverabilityMode, OwnAddressType

from pandora.security_grpc import Security, SecurityStorage, PairingEventAnswer

from pandora.security_pb2 import LESecurityLevel





class GAPProxy(ProfileProxy):