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

Commit 1dbf9ea2 authored Sep 09, 2022 by Thomas Girardier Committed by Automerger Merge Worker Sep 09, 2022

Merge changes I6719a3d2,I3a20d38e am: fbc98156 am: 4cf36073

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

Change-Id: I6a9c6d627bd8858416dc58498883a37ca904ad68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6c2d0ada 4cf36073

android/pandora/mmi2grpc/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,6 @@ filegroup {
		srcs: [
		"mmi2grpc/*.py",
		"pandora/*.py",
		":pandora-grpc-python",
		":pandora_experimental-python-src",
		],
		}

android/pandora/mmi2grpc/mmi2grpc/init.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ from mmi2grpc.sdp import SDPProxy
		from mmi2grpc.sm import SMProxy
		from mmi2grpc._helpers import format_proxy

		from pandora.host_grpc import Host
		from pandora_experimental.host_grpc import Host

		GRPC_PORT = 8999
		MAX_RETRIES = 10

android/pandora/mmi2grpc/mmi2grpc/_helpers.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ def format_proxy(profile, mmi_name, mmi_description):
		return (f'from mmi2grpc._helpers import assert_description\n'
		f'from mmi2grpc._proxy import ProfileProxy\n'
		f'\n'
		f'from pandora.{profile.lower()}_grpc import {profile}\n'
		f'from pandora_experimental.{profile.lower()}_grpc import {profile}\n'
		f'\n'
		f'\n'
		f'class {profile}Proxy(ProfileProxy):\n'

android/pandora/mmi2grpc/mmi2grpc/a2dp.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -22,10 +22,10 @@ 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, PlaybackAudioRequest
		from pandora.host_grpc import Host
		from pandora.host_pb2 import Connection
		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

		AUDIO_SIGNAL_AMPLITUDE = 0.8
		AUDIO_SIGNAL_SAMPLING_RATE = 44100

android/pandora/mmi2grpc/mmi2grpc/avrcp.py

+5 −5

Original line number	Diff line number	Diff line
		@@ -21,11 +21,11 @@ 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
		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


		class AVRCPProxy(ProfileProxy):