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

Change-Id: I2602e9a93a08b5c131be457e69e649ab3b4e13b0
This commit is contained in:
Eric Laurent
2020-04-21 18:12:31 +00:00
committed by Automerger Merge Worker

View File

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