PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf

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

Change-Id: I94f33e7f52875dbccbf6327430a6192ce01a4ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-11 10:10:41 +00:00
committed by Automerger Merge Worker
parent 402ffdeaf6 59fa9de0cf
commit 4d61561fa3
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
View File

@@ -196,10 +196,11 @@ public abstract class DeviceListPreferenceFragment extends
}
// Prevent updates while the list shows one of the state messages
if (mBluetoothAdapter.getState() != BluetoothAdapter.STATE_ON) return;
if (mBluetoothAdapter.getState() != BluetoothAdapter.STATE_ON) {
return;
}
if (mLeScanFilters != null
|| (mFilter != null && mFilter.matches(cachedDevice.getDevice()))) {
if (mFilter != null && mFilter.matches(cachedDevice.getDevice())) {
createDevicePreference(cachedDevice);
}
}
@@ -325,7 +326,12 @@ public abstract class DeviceListPreferenceFragment extends
if (cachedDevice == null) {
cachedDevice = mCachedDeviceManager.addDevice(device);
}
onDeviceAdded(cachedDevice);
// Only add device preference when it's not found in the map and there's no other
// state message showing in the list
if (mDevicePreferenceMap.get(cachedDevice) == null
&& mBluetoothAdapter.getState() == BluetoothAdapter.STATE_ON) {
createDevicePreference(cachedDevice);
}
}
@Override