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

Commit 351c17c4 authored by Rahul Arya's avatar Rahul Arya
Browse files

[Pandora] Utility getters 

Implements the GetConnection interface, and defines+implements
GetDevice. Needed for GAP.

Test: GAP pts
Bug: 248814583

Change-Id: I7c0e928cdea219573843e27cd599ff94f51599e5
parent 6e22bfea

android/pandora/server/proto/pandora_experimental/host.proto

+10 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ service Host { 
  rpc SetConnectabilityMode(SetConnectabilityModeRequest) returns (SetConnectabilityModeResponse);

  // Set BREDR discoverable mode

  rpc SetDiscoverabilityMode(SetDiscoverabilityModeRequest) returns (SetDiscoverabilityModeResponse);

  // Get device name from connection

  rpc GetDeviceName(GetDeviceNameRequest) returns (GetDeviceNameResponse);

}



// Response of the `ReadLocalAddress` method.
@@ -287,3 +289,11 @@ message SetDiscoverabilityModeRequest { 
}



message SetDiscoverabilityModeResponse {}



message GetDeviceNameRequest {

  Connection connection = 1;

}



message GetDeviceNameResponse {

  string name = 1;

}

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

+28 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.bluetooth.BluetoothProfile 
import android.bluetooth.le.AdvertiseCallback

import android.bluetooth.le.AdvertiseData

import android.bluetooth.le.AdvertiseSettings

import android.bluetooth.le.AdvertisingSetParameters

import android.bluetooth.le.ScanCallback

import android.bluetooth.le.ScanResult

import android.content.Context
@@ -44,9 +43,6 @@ import io.grpc.stub.StreamObserver 
import java.io.IOException

import java.time.Duration

import java.util.UUID

import kotlin.Result.Companion.failure

import kotlin.Result.Companion.success

import kotlin.coroutines.suspendCoroutine

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.awaitCancellation
@@ -274,6 +270,21 @@ class Host(private val context: Context, private val server: Server) : HostImplB 
    }

  }



  override fun getConnection(

    request: GetConnectionRequest,

    responseObserver: StreamObserver<GetConnectionResponse>

  ) {

    grpcUnary(scope, responseObserver) {

      val device = bluetoothAdapter.getRemoteDevice(request.address.toByteArray())

      check(

        device.isConnected() && device.type != BluetoothDevice.DEVICE_TYPE_LE

      ) // either classic or dual

      GetConnectionResponse.newBuilder()

        .setConnection(newConnection(device, Transport.TRANSPORT_BREDR))

        .build()

    }

  }



  override fun disconnect(

    request: DisconnectRequest,

    responseObserver: StreamObserver<DisconnectResponse>
@@ -424,7 +435,9 @@ class Host(private val context: Context, private val server: Server) : HostImplB 


          bluetoothAdapter.bluetoothLeAdvertiser.startAdvertising(

            AdvertiseSettings.Builder()

              .setConnectable(request.connectabilityMode == ConnectabilityMode.CONECTABILITY_CONNECTABLE)

              .setConnectable(

                request.connectabilityMode == ConnectabilityMode.CONECTABILITY_CONNECTABLE

              )

              .setOwnAddressType(

                when (request.ownAddressType!!) {

                  AddressType.PUBLIC -> ADDRESS_TYPE_PUBLIC
@@ -580,4 +593,14 @@ class Host(private val context: Context, private val server: Server) : HostImplB 
      }

    }

  }



  override fun getDeviceName(

    request: GetDeviceNameRequest,

    responseObserver: StreamObserver<GetDeviceNameResponse>

  ) {

    grpcUnary(scope, responseObserver) {

      val device = request.connection.toBluetoothDevice(bluetoothAdapter)

      GetDeviceNameResponse.newBuilder().setName(device.name).build()

    }

  }

}