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

Commit 8e463e62 authored by Raj Goparaju's avatar Raj Goparaju Committed by Android (Google) Code Review
Browse files

Merge "Fix flaky AudioFocusTest#testAudioMediaFocusDelayedByCall" into main

parents 31c94886 3c6536f4

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);

        }