commit 1bb8e28762b7fe6e1bc66c3aa4cfde922ac7be08
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 07 08:35:48 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 07 08:35:48 2024 +0000
tree 048815557773aeed7f5acf12f0b476b84851b194
parent ce2a5e07e291ec57e6f11fd2fb9be0657481fa55
parent de3f413ecd4a632eb742bbfbebd55dec6396cb70

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

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

diff --git a/src/com/android/settings/network/TetheredRepository.kt b/src/com/android/settings/network/TetheredRepository.kt
index f18bdca..29a5665 100644
--- a/src/com/android/settings/network/TetheredRepository.kt
+++ b/src/com/android/settings/network/TetheredRepository.kt
@@ -72,7 +72,7 @@
             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 @@
             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)
 }