PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ibb00cb80a1d0c34a5a73f26b21ebe212692fc49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-06-07 08:56:58 +00:00
committed by Automerger Merge Worker
parent 9bf082ae01 1bb8e28762
commit 95da1e4de2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/TetheredRepository.kt
View File

@@ -72,7 +72,7 @@ class TetheredRepository(private val context: Context) {
flowOf(null), // kick an initial value flowOf(null), // kick an initial value
context.broadcastReceiverFlow(IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED)), context.broadcastReceiverFlow(IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED)),
).flatMapLatest { ).flatMapLatest {
if (adapter.getState() == BluetoothAdapter.STATE_ON) { if (adapter?.getState() == BluetoothAdapter.STATE_ON) {
isBluetoothPanTetheringOnFlow() isBluetoothPanTetheringOnFlow()
} else { } else {
flowOf(false) flowOf(false)
@@ -93,10 +93,10 @@ class TetheredRepository(private val context: Context) {
override fun onServiceDisconnected(profile: Int) {} override fun onServiceDisconnected(profile: Int) {}
} }
adapter.getProfileProxy(context, listener, BluetoothProfile.PAN) adapter?.getProfileProxy(context, listener, BluetoothProfile.PAN)
awaitClose { awaitClose {
connectedProxy?.let { adapter.closeProfileProxy(BluetoothProfile.PAN, it) } connectedProxy?.let { adapter?.closeProfileProxy(BluetoothProfile.PAN, it) }
} }
}.conflate().flowOn(Dispatchers.Default) }.conflate().flowOn(Dispatchers.Default)
} }