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

Commit 95da1e4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e287 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118024



Change-Id: Ibb00cb80a1d0c34a5a73f26b21ebe212692fc49c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9bf082ae 1bb8e287

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)

}