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

Commit d7bfedf6 authored by Charlie Boutier's avatar Charlie Boutier
Browse files

PandoraServer: Load only Host if Bluetooth is off 

If Bluetooth is turned off, the server will try to get the available profiles,
but they will be null. This will cause the server to crash.
Filtering the nullable profiles will allow the user to
perform a factory reset to turn the Bluetooth back on.

Bug: 279190568
Test: atest pts-bot:<test> -v
Change-Id: Iaa5c1d5474e58bf5578811edfdf6088ab2d81731
parent 7911003f

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

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ class Server(context: Context) { 
    val bluetoothAdapter = context.getSystemService(BluetoothManager::class.java)!!.adapter



    val security = Security(context)



    // If Bluetooth is turned off, the server will try to get the available profiles,

    // but they will be null which will cause the server to crash.

    // Filtering the nullable profiles will allow the user to

    // perform a factory reset to turn the Bluetooth back on.

    services =

      listOf(

        security,
@@ -60,6 +65,7 @@ class Server(context: Context) { 
            BluetoothProfile.PAN to ::Pan,

            BluetoothProfile.PBAP to ::Pbap,

          )

          .filter { bluetoothAdapter.isEnabled }

          .filter { bluetoothAdapter.getSupportedProfiles().contains(it.key) == true }

          .map { it.value(context) }