commit f6f0126b8e458c09bb312032eddc8fadeaec238c
author Alice Kuo <aliceypkuo@google.com> Mon Nov 29 02:29:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 29 02:29:31 2021 +0000
tree 4b4bac03af6673baef749ab71b5ede8ffc070782
parent 6aa53808f3ed4b123387318353c568b94c9654d9
parent c78fb83aeedb5ce5f9bcef0817f1a92e817c75fd

Do not update the previously connected devices for the sub device am: c78fb83aee

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

Change-Id: I3c062b23b8772496cb149ad1eff8483836a79289

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

diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index dab4f23..f5bc279 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -65,7 +65,7 @@
             removePreferenceIfNecessary(bluetoothDevices, cachedManager);
             for (BluetoothDevice device : bluetoothDevices) {
                 final CachedBluetoothDevice cachedDevice = cachedManager.findDevice(device);
-                if (cachedDevice != null) {
+                if (cachedDevice != null && !cachedManager.isSubDevice(device)) {
                     update(cachedDevice);
                 }
             }