Merge "Fix null point exception on LocalMediaManager" into rvc-dev am:... (f8b315bc) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ public class LocalMediaManager implements BluetoothCallback {
		*/
		public MediaDevice getMediaDeviceById(List<MediaDevice> devices, String id) {
		for (MediaDevice mediaDevice : devices) {
		if (mediaDevice.getId().equals(id)) {
		if (TextUtils.equals(mediaDevice.getId(), id)) {
		return mediaDevice;
		}
		}
		@@ -236,7 +236,7 @@ public class LocalMediaManager implements BluetoothCallback {
		*/
		public MediaDevice getMediaDeviceById(String id) {
		for (MediaDevice mediaDevice : mMediaDevices) {
		if (mediaDevice.getId().equals(id)) {
		if (TextUtils.equals(mediaDevice.getId(), id)) {
		return mediaDevice;
		}
		}

+20 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,26 @@ public class LocalMediaManagerTest {
		assertThat(device).isNull();
		}

		@Test
		public void getMediaDeviceById_idIsNull_shouldReturnNull() {
		final MediaDevice device1 = mock(MediaDevice.class);
		final MediaDevice device2 = mock(MediaDevice.class);
		mLocalMediaManager.mMediaDevices.add(device1);
		mLocalMediaManager.mMediaDevices.add(device2);

		when(device1.getId()).thenReturn(null);
		when(device2.getId()).thenReturn(null);

		MediaDevice device = mLocalMediaManager
		.getMediaDeviceById(mLocalMediaManager.mMediaDevices, TEST_CURRENT_DEVICE_ID);

		assertThat(device).isNull();

		device = mLocalMediaManager.getMediaDeviceById(TEST_CURRENT_DEVICE_ID);

		assertThat(device).isNull();
		}

		@Test
		public void onDeviceAdded_addDevice() {
		final MediaDevice device = mock(MediaDevice.class);