Merge "Fix test failing with NPE due to null List" into main (1f51f740) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioDevicePort.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.os.Build;

		import com.android.aconfig.annotations.VisibleForTesting;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;

		@@ -68,14 +69,14 @@ public class AudioDevicePort extends AudioPort {
		return new AudioDevicePort(
		new AudioHandle(/* id= */ 0),
		/* name= */ "testAudioDevicePort",
		/* profiles= */ null,
		/* profiles= */ new ArrayList<>(),
		/* gains= */ null,
		/* type= */ AudioManager.DEVICE_OUT_SPEAKER,
		/* address= */ "testAddress",
		/* speakerLayoutChannelMask= */ speakerLayoutChannelMask,
		/* encapsulationModes= */ null,
		/* encapsulationMetadataTypes= */ null,
		/* descriptors= */ null);
		/* descriptors= */ new ArrayList<>());
		}

		private final int mType;