Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix null point exception on LocalMediaManager" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-06 06:47:34 +00:00
committed by Android (Google) Code Review
parent 839dbccf9f 4e6e52443d
commit 072d9fe006
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
View File

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

20
packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java
View File

@@ -217,6 +217,26 @@ public class LocalMediaManagerTest {
assertThat(device).isNull(); 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 @Test
public void onDeviceAdded_addDevice() { public void onDeviceAdded_addDevice() {
final MediaDevice device = mock(MediaDevice.class); final MediaDevice device = mock(MediaDevice.class);