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

2020-04-21 17:55:49 +00:00
parent 094eafd471 9704e1275a
commit 346f1bcf90
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/audio/MediaFocusControl.java
+++ b/services/core/java/com/android/server/audio/MediaFocusControl.java
@@ -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);
        }