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

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

Merge "AudioService: Focus: cleanup FocusOwner upon requestAudioFocus failure"... 

Merge "AudioService: Focus: cleanup FocusOwner upon requestAudioFocus failure" am: 346f1bcf am: a3937db0 am: 0c95ae1c am: 55d7812f am: f5d67b03

Change-Id: I73f7726acbbcaa5ab19a46a5d76f51565f7f0a43
parents 8c489faa f5d67b03

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

+6 −1
Original line number Diff line number Diff line
@@ -679,7 +679,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);

        }