Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aca0a9e9 authored May 04, 2022 by Jean-Michel Trivi Committed by Android (Google) Code Review May 04, 2022

Merge "AudioService: fix muteAwaitConnection device check" into tm-dev

parents 7c4b55cc 5b65df1b

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -9135,6 +9135,8 @@ public class AudioService extends IAudioService.Stub
		if (timeOutMs <= 0 \|\| usages.length == 0) {
		throw new IllegalArgumentException("Invalid timeOutMs/usagesToMute");
		}
		Log.i(TAG, "muteAwaitConnection dev:" + device + " timeOutMs:" + timeOutMs
		+ " usages:" + usages);

		if (mDeviceBroker.isDeviceConnected(device)) {
		// not throwing an exception as there could be a race between a connection (server-side,
		@@ -9178,7 +9180,7 @@ public class AudioService extends IAudioService.Stub
		Log.i(TAG, "cancelMuteAwaitConnection ignored, no expected device");
		return;
		}
		if (!device.equals(mMutingExpectedDevice)) {
		if (!device.equalTypeAddress(mMutingExpectedDevice)) {
		Log.e(TAG, "cancelMuteAwaitConnection ignored, got " + device
		+ "] but expected device is" + mMutingExpectedDevice);
		throw new IllegalStateException("cancelMuteAwaitConnection for wrong device");

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -1158,6 +1158,8 @@ public final class PlaybackActivityMonitor
		//==========================================================================================
		void muteAwaitConnection(@NonNull int[] usagesToMute,
		@NonNull AudioDeviceAttributes dev, long timeOutMs) {
		sEventLogger.loglogi(
		"muteAwaitConnection() dev:" + dev + " timeOutMs:" + timeOutMs, TAG);
		synchronized (mPlayerLock) {
		mutePlayersExpectingDevice(usagesToMute);
		// schedule timeout (remove previously scheduled first)
		@@ -1169,6 +1171,7 @@ public final class PlaybackActivityMonitor
		}

		void cancelMuteAwaitConnection() {
		sEventLogger.loglogi("cancelMuteAwaitConnection()", TAG);
		synchronized (mPlayerLock) {
		// cancel scheduled timeout, ignore device, only one expected device at a time
		mEventHandler.removeMessages(MSG_L_TIMEOUT_MUTE_AWAIT_CONNECTION);