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

This commit is contained in:
Eric Laurent
2020-04-21 17:55:49 +00:00
committed by Gerrit Code Review

View File

@@ -625,7 +625,12 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
return; 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) { if (fr != null) {
fr.dispatchFocusResultFromExtPolicy(requestResult); fr.dispatchFocusResultFromExtPolicy(requestResult);
} }