Merge "Check if getParameters reply contains the required key" into main (d73ad26a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioService.java

+14 −10

Original line number	Diff line number	Diff line
		@@ -14678,12 +14678,14 @@ public class AudioService extends IAudioService.Stub
		final String key = "additional_output_device_delay";
		final String reply = AudioSystem.getParameters(
		key + "=" + device.getInternalType() + "," + device.getAddress());
		long delayMillis;
		long delayMillis = 0;
		if (reply.contains(key)) {
		try {
		delayMillis = Long.parseLong(reply.substring(key.length() + 1));
		} catch (NullPointerException e) {
		delayMillis = 0;
		}
		}
		return delayMillis;
		}

		@@ -14708,12 +14710,14 @@ public class AudioService extends IAudioService.Stub
		final String key = "max_additional_output_device_delay";
		final String reply = AudioSystem.getParameters(
		key + "=" + device.getInternalType() + "," + device.getAddress());
		long delayMillis;
		long delayMillis = 0;
		if (reply.contains(key)) {
		try {
		delayMillis = Long.parseLong(reply.substring(key.length() + 1));
		} catch (NullPointerException e) {
		delayMillis = 0;
		}
		}
		return delayMillis;
		}