commit 8822907513872445183a9c486bdd76a2c615f142
author Haijie Hong <hahong@google.com> Tue Jun 25 13:23:07 2024 +0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 26 02:04:14 2024 +0000
tree 4354b4963c54122e1d0986bf5ad27df13984766a
parent a07738266b24a0b12c2d7d767668b38d59942c56

Add device to to cached device manager if it's not present

Bug: 346923808
Test: atest BluetoothDeviceDetailsFragmentTest
Flag: EXEMPT minor bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a074f274991f6a172855e0253f49b0a6dd63c758)
Merged-In: Ia4987bc7ec93cb6b54d188922b7232d83d528f2f
Change-Id: Ia4987bc7ec93cb6b54d188922b7232d83d528f2f

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

diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 44915fe..5f9957b 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -142,13 +142,23 @@
     }
 
     @VisibleForTesting
+    @Nullable
     CachedBluetoothDevice getCachedDevice(String deviceAddress) {
         if (sTestDataFactory != null) {
             return sTestDataFactory.getDevice(deviceAddress);
         }
         BluetoothDevice remoteDevice =
                 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