commit f75356ca216712741335d0836cfa3820b1cc2842
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sun Jun 25 18:52:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sun Jun 25 18:52:19 2023 +0000
tree e85ac6436481d2311888d305894e98eb6b9ab715
parent 6c1f5635c9d6e036b0b1efd2864ea86914031478
parent c97fe1a27f3c7be5a66d9b9221318ffe0c2936ea

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

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

Change-Id: I74132b143b5312886d27ddf6f8e5eb3bb74ce9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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);
         }
     }