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

Merge "Add device to to cached device manager if it's not present" into main

Browse Source
This commit is contained in:
Haijie Hong
2024-06-25 16:06:55 +00:00
committed by Android (Google) Code Review
parent 9616a8ea11 a074f27499
commit 9bf762bfdd
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
View File

@@ -142,13 +142,23 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
} }
@VisibleForTesting @VisibleForTesting
@Nullable
CachedBluetoothDevice getCachedDevice(String deviceAddress) { CachedBluetoothDevice getCachedDevice(String deviceAddress) {
if (sTestDataFactory != null) { if (sTestDataFactory != null) {
return sTestDataFactory.getDevice(deviceAddress); return sTestDataFactory.getDevice(deviceAddress);
} }
BluetoothDevice remoteDevice = BluetoothDevice remoteDevice =
mManager.getBluetoothAdapter().getRemoteDevice(deviceAddress); mManager.getBluetoothAdapter().getRemoteDevice(deviceAddress);
return mManager.getCachedDeviceManager().findDevice(remoteDevice); if (remoteDevice == null) {
return null;
}
CachedBluetoothDevice cachedDevice =
mManager.getCachedDeviceManager().findDevice(remoteDevice);
if (cachedDevice != null) {
return cachedDevice;
}
Log.i(TAG, "Add device to cached device manager: " + remoteDevice.getAnonymizedAddress());
return mManager.getCachedDeviceManager().addDevice(remoteDevice);
} }
@VisibleForTesting @VisibleForTesting