Merge "Return empty array when BluetoothAdapter is null" into rvc-dev (635c9bcb) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -401,6 +401,11 @@ public class LocalMediaManager implements BluetoothCallback {
		}

		private List<MediaDevice> buildDisconnectedBluetoothDevice() {
		if (mBluetoothAdapter == null) {
		Log.w(TAG, "buildDisconnectedBluetoothDevice() BluetoothAdapter is null");
		return new ArrayList<>();
		}

		final List<BluetoothDevice> bluetoothDevices =
		mBluetoothAdapter.getMostRecentlyConnectedDevices();
		final CachedBluetoothDeviceManager cachedDeviceManager =

+24 −0

Original line number	Diff line number	Diff line
		@@ -691,4 +691,28 @@ public class LocalMediaManagerTest {
		assertThat(mLocalMediaManager.mMediaDevices).hasSize(7);
		verify(mCallback).onDeviceListUpdate(any());
		}

		@Test
		public void onDeviceListAdded_bluetoothAdapterIsNull_noDisconnectedDeviceAdded() {
		final List<MediaDevice> devices = new ArrayList<>();
		final MediaDevice device1 = mock(MediaDevice.class);
		final MediaDevice device2 = mock(MediaDevice.class);
		final MediaDevice device3 = mock(MediaDevice.class);
		mLocalMediaManager.mPhoneDevice = mock(PhoneMediaDevice.class);
		devices.add(device1);
		devices.add(device2);
		mLocalMediaManager.mMediaDevices.add(device3);
		mLocalMediaManager.mMediaDevices.add(mLocalMediaManager.mPhoneDevice);

		mShadowBluetoothAdapter = null;

		when(mLocalMediaManager.mPhoneDevice.getId()).thenReturn("test_phone_id");

		assertThat(mLocalMediaManager.mMediaDevices).hasSize(2);
		mLocalMediaManager.registerCallback(mCallback);
		mLocalMediaManager.mMediaDeviceCallback.onDeviceListAdded(devices);

		assertThat(mLocalMediaManager.mMediaDevices).hasSize(2);
		verify(mCallback).onDeviceListUpdate(any());
		}
		}