diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceController.java
index f1119fc..d001409 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceController.java
@@ -25,10 +25,10 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.widget.SummaryUpdater;
 
 public class AudioStreamsActiveDeviceController extends BasePreferenceController
-        implements SummaryUpdater.OnSummaryChangeListener, DefaultLifecycleObserver {
+        implements AudioStreamsActiveDeviceSummaryUpdater.OnSummaryChangeListener,
+                DefaultLifecycleObserver {
 
     public static final String KEY = "audio_streams_active_device";
     private final AudioStreamsActiveDeviceSummaryUpdater mSummaryHelper;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
index 66101f7..cf79596 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
@@ -19,28 +19,30 @@
 import android.annotation.Nullable;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils;
-import com.android.settings.widget.SummaryUpdater;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.BluetoothUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.Optional;
 
-public class AudioStreamsActiveDeviceSummaryUpdater extends SummaryUpdater
-        implements BluetoothCallback {
-    private static final String TAG = "AudioStreamsListenWithSummaryUpdater";
+public class AudioStreamsActiveDeviceSummaryUpdater implements BluetoothCallback {
+    private static final String TAG = "AudioStreamsActiveDeviceSummaryUpdater";
     private static final boolean DEBUG = BluetoothUtils.D;
     private final LocalBluetoothManager mBluetoothManager;
+    private String mSummary;
+    private OnSummaryChangeListener mListener;
 
     public AudioStreamsActiveDeviceSummaryUpdater(
             Context context, OnSummaryChangeListener listener) {
-        super(context, listener);
         mBluetoothManager = Utils.getLocalBluetoothManager(context);
+        mListener = listener;
     }
 
     @Override
@@ -59,8 +61,7 @@
         }
     }
 
-    @Override
-    public void register(boolean register) {
+    void register(boolean register) {
         if (register) {
             notifyChangeIfNeeded();
             mBluetoothManager.getEventManager().registerCallback(this);
@@ -69,8 +70,18 @@
         }
     }
 
-    @Override
-    protected String getSummary() {
+    private void notifyChangeIfNeeded() {
+        ThreadUtils.postOnBackgroundThread(
+                () -> {
+                    String summary = getSummary();
+                    if (!TextUtils.equals(mSummary, summary)) {
+                        mSummary = summary;
+                        ThreadUtils.postOnMainThread(() -> mListener.onSummaryChanged(summary));
+                    }
+                });
+    }
+
+    private String getSummary() {
         var activeSink = getActiveSinkOnAssistant(mBluetoothManager);
         if (activeSink.isEmpty()) {
             return "No active LE Audio device";
@@ -95,4 +106,14 @@
         }
         return Optional.empty();
     }
+
+    /** Interface definition for a callback to be invoked when the summary has been changed. */
+    interface OnSummaryChangeListener {
+        /**
+         * Called when summary has changed.
+         *
+         * @param summary The new summary.
+         */
+        void onSummaryChanged(String summary);
+    }
 }
