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

Commit de3f413e authored by hoffc's avatar hoffc
Browse files

Fix NPE force close if disabling BT feature 

adapter can be null in some SPs which disable bluetooth feature
from framework, so it will lead to NPE force close in these SPs.

Add null check for adapter.

Bug: 345584461

Change-Id: I3fabe94a97cc9baf7b1739fe1c9160a52b50d7d4
parent ce2a5e07

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)

}