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

Commit 1d748570 authored by Abel Lucas's avatar Abel Lucas Committed by Automerger Merge Worker
Browse files

Merge "PandoraServer: Properly cancel the job" am: e65f667e 

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



Change-Id: I48372cb869439deaed8c1a3d7ad711118dd1fc1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3dbf4777 e65f667e

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

+3 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ fun <T, U> grpcBidirectionalStream( 
): StreamObserver<T> {



  val inputChannel = Channel<T>()

  val serverCallStreamObserver = responseObserver as ServerCallStreamObserver<T>



  val job =

    scope.launch {
@@ -184,6 +185,8 @@ fun <T, U> grpcBidirectionalStream( 
        .launchIn(this)

    }



  serverCallStreamObserver.setOnCancelHandler { job.cancel() }



  return object : StreamObserver<T> {

    override fun onNext(req: T) {

      // Note: this should be made a blocking call, and the handler should run in a separate thread