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

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

Merge changes I72d0f436,Ie5d28789 am: 8f2bd80e am: 2f96b3cd am: 31549b89 

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



Change-Id: Icfa48c89c59c6d75f0a0cb6f74a1ab0035518367
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3dedc80 31549b89

android/pandora/mmi2grpc/mmi2grpc/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ class IUT: 
            description: MMI description.

            style: MMI popup style, unused for now.

        """

        print(f'{profile} mmi: {description}', file=sys.stderr)

        print(f'{profile} mmi: {interaction}', file=sys.stderr)



        # Handles A2DP and AVDTP MMIs.

        if profile in ('A2DP', 'AVDTP'):

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

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import io.grpc.stub.StreamObserver 
import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.cancel

import kotlinx.coroutines.delay

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.filter
@@ -118,6 +119,10 @@ class A2dp(val context: Context) : A2DPImplBase() { 
          throw Status.UNKNOWN.asException()

        }

      }



      //TODO: b/234891800, AVDTP start request sometimes never sent if playback starts too early.

      delay(2000L)



      val source = Source.newBuilder().setCookie(request.connection.cookie).build()

      OpenSourceResponse.newBuilder().setSource(source).build()

    }
@@ -152,6 +157,10 @@ class A2dp(val context: Context) : A2DPImplBase() { 
          throw Status.UNKNOWN.asException()

        }

      }



      //TODO: b/234891800, AVDTP start request sometimes never sent if playback starts too early.

      delay(2000L)



      val source = Source.newBuilder().setCookie(request.connection.cookie).build()

      WaitSourceResponse.newBuilder().setSource(source).build()

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import io.grpc.stub.StreamObserver 
import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.cancel

import kotlinx.coroutines.delay

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.filter
@@ -87,6 +88,10 @@ class Host(private val context: Context, private val server: Server) : HostImplB 
        bluetoothAdapter.disable()

        stateFlow.filter { it == BluetoothAdapter.STATE_OFF }.first()

      }



      //TODO: b/234892968

      delay(2000L)



      bluetoothAdapter.enable()

      stateFlow.filter { it == BluetoothAdapter.STATE_ON }.first()