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

Commit a3937db0 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioService: Focus: cleanup FocusOwner upon requestAudioFocus failure" am: 346f1bcf 

Change-Id: I2602e9a93a08b5c131be457e69e649ab3b4e13b0
parents 4664c003 346f1bcf

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

+6 −1
Original line number Diff line number Diff line
@@ -625,7 +625,12 @@ public class MediaFocusControl implements PlayerFocusEnforcer { 
                return;

            }

        }

        final FocusRequester fr = mFocusOwnersForFocusPolicy.get(afi.getClientId());

        final FocusRequester fr;

        if (requestResult == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {

            fr = mFocusOwnersForFocusPolicy.remove(afi.getClientId());

        } else {

            fr = mFocusOwnersForFocusPolicy.get(afi.getClientId());

        }

        if (fr != null) {

            fr.dispatchFocusResultFromExtPolicy(requestResult);

        }