Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88229075 authored by Haijie Hong's avatar Haijie Hong Committed by Android Build Coastguard Worker
Browse files

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
parent a0773826

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

+11 −1
Original line number Diff line number Diff line
@@ -142,13 +142,23 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment 
    }



    @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