commit 180a686af08b7c2e1855617fb6463c26faf84749
author Yiyi Shen <yiyishen@google.com> Wed Jan 10 12:11:38 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 10 12:11:38 2024 +0000
tree 7059fadbb2e599d77c8d5293b028806831b70f23
parent 6abf22553fd1744f4c94b56600e0d5fca01e69f3
parent 9f60c22fad6d32e5a7b64068f31beef9a778f147

Merge "[Audiosharing] Skip active device switch" into main

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java

diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
index fff7bfd..ae1d791 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
@@ -166,7 +166,6 @@
                                     + ", reason = "
                                     + reason);
                     mBluetoothDeviceUpdater.forceUpdate();
-                    AudioSharingUtils.updateActiveDeviceIfNeeded(mLocalBtManager);
                 }
 
                 @Override
@@ -211,7 +210,6 @@
                                     + ", reason = "
                                     + reason);
                     mBluetoothDeviceUpdater.forceUpdate();
-                    AudioSharingUtils.updateActiveDeviceIfNeeded(mLocalBtManager);
                 }
 
                 @Override

src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java

diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java
index 50d799c..3f0717d 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java
@@ -203,7 +203,6 @@
                                     + sourceId
                                     + ", reason = "
                                     + reason);
-                    AudioSharingUtils.updateActiveDeviceIfNeeded(mBtManager);
                 }
 
                 @Override