Merge "Add device to to cached device manager if it's not present" into main (9bf762bf) · Commits · e / os / android_packages_apps_Settings

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