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

Commit 421d3d20 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "PandoraServer: Load only Host if Bluetooth is off" am: ddaba0e1 

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



Change-Id: I68ae5b8d99bd98fba64c583be419b6965818c4b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a79dc503 ddaba0e1

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) }