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

Commit 1bb8e287 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix NPE force close if disabling BT feature" into main

parents ce2a5e07 de3f413e

src/com/android/settings/network/TetheredRepository.kt

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class TetheredRepository(private val context: Context) { 
            flowOf(null), // kick an initial value

            context.broadcastReceiverFlow(IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED)),

        ).flatMapLatest {

            if (adapter.getState() == BluetoothAdapter.STATE_ON) {

            if (adapter?.getState() == BluetoothAdapter.STATE_ON) {

                isBluetoothPanTetheringOnFlow()

            } else {

                flowOf(false)
@@ -93,10 +93,10 @@ class TetheredRepository(private val context: Context) { 
            override fun onServiceDisconnected(profile: Int) {}

        }



        adapter.getProfileProxy(context, listener, BluetoothProfile.PAN)

        adapter?.getProfileProxy(context, listener, BluetoothProfile.PAN)



        awaitClose {

            connectedProxy?.let { adapter.closeProfileProxy(BluetoothProfile.PAN, it) }

            connectedProxy?.let { adapter?.closeProfileProxy(BluetoothProfile.PAN, it) }

        }

    }.conflate().flowOn(Dispatchers.Default)

}