commit c97fe1a27f3c7be5a66d9b9221318ffe0c2936ea
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sun Jun 25 18:11:03 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jun 25 18:11:03 2023 +0000
tree 0a9657e1a0a5878b4b0c2e33ccc180674d90cb0a
parent 7239e2d59a135d2b0d04a2f87d3a69b4680e8653
parent dbe58e96dcf63741db220266e0145a939e447be0

Merge "Stop the searching of broadcast" into udc-qpr-dev

src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java

diff --git a/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java b/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java
index 05bc179..f9d083d 100644
--- a/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java
@@ -125,6 +125,10 @@
                         Log.w(TAG, "onSourceAdded: mSelectedPreference == null!");
                         return;
                     }
+                    if (mLeBroadcastAssistant != null
+                            && mLeBroadcastAssistant.isSearchInProgress()) {
+                        mLeBroadcastAssistant.stopSearchingForSources();
+                    }
                     getActivity().runOnUiThread(() -> updateListCategoryFromBroadcastMetadata(
                             mSelectedPreference.getBluetoothLeBroadcastMetadata(), true));
                 }
@@ -232,6 +236,9 @@
     public void onStop() {
         super.onStop();
         if (mLeBroadcastAssistant != null) {
+            if (mLeBroadcastAssistant.isSearchInProgress()) {
+                mLeBroadcastAssistant.stopSearchingForSources();
+            }
             mLeBroadcastAssistant.unregisterServiceCallBack(mBroadcastAssistantCallback);
         }
     }