Commit 3c6536f4 authored Oct 03, 2023 by Raj Goparaju

Fix flaky AudioFocusTest#testAudioMediaFocusDelayedByCall

When using external focus policy, the caller thread
requesting audio focus for test could be blocked while the
dispatch callback is prioritized. This results in the
client id not being added in time for the dispatch call
resulting in null pointer reference and finally request fail.

Fix it by ensuring the client id is added before handling
the response.

Bug: 303223553
Bug: 302870089
Test: atest -c --rerun-until-failure 1000
         AudioFocusTest#testAudioMediaFocusDelayedByCall
Change-Id: I7b2fe8601ca2b502501ee6af64f78d97a5be1f20

parent 4a22e55a

media/java/android/media/AudioManager.java

+16 −16

Original line number	Diff line number	Diff line
		@@ -4659,6 +4659,8 @@ public class AudioManager {
		Objects.requireNonNull(afr);
		Objects.requireNonNull(clientFakeId);
		int status;
		BlockingFocusResultReceiver focusReceiver;
		synchronized (mFocusRequestsLock) {
		try {
		status = getService().requestAudioFocusForTest(afr.getAudioAttributes(),
		afr.getFocusGain(),
		@@ -4675,8 +4677,6 @@ public class AudioManager {
		return status;
		}

		BlockingFocusResultReceiver focusReceiver;
		synchronized (mFocusRequestsLock) {
		focusReceiver = addClientIdToFocusReceiverLocked(clientFakeId);
		}