Merge "Revert "remove getName() from CachedBluetoothDeviceManager"" (139a8c79) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -211,6 +211,26 @@ public class CachedBluetoothDeviceManager {
		}
		}

		/**
		* Attempts to get the name of a remote device, otherwise returns the address.
		*
		* @param device The remote device.
		* @return The name, or if unavailable, the address.
		*/
		public String getName(BluetoothDevice device) {
		CachedBluetoothDevice cachedDevice = findDevice(device);
		if (cachedDevice != null && cachedDevice.getName() != null) {
		return cachedDevice.getName();
		}

		String name = device.getAliasName();
		if (name != null) {
		return name;
		}

		return device.getAddress();
		}

		public synchronized void clearNonBondedDevices() {

		mCachedDevicesMapForHearingAids.entrySet().removeIf(entries

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ public class CachedBluetoothDeviceManagerTest {
		public void testGetName_validCachedDevice_nameFound() {
		CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);
		assertThat(cachedDevice1).isNotNull();
		assertThat(mCachedDeviceManager.findDevice(mDevice1).getName()).isEqualTo(DEVICE_ALIAS_1);
		assertThat(mCachedDeviceManager.getName(mDevice1)).isEqualTo(DEVICE_ALIAS_1);
		}

		/**