Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2017-05-02 17:52:32 +00:00
committed by Android (Google) Code Review
parent 72c0ab518a 7b8da92d49
commit dce4dfc6fc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/audio/FocusRequester.java
View File

@@ -342,6 +342,7 @@ public class FocusRequester {
mFocusLossWasNotified = false; mFocusLossWasNotified = false;
// before dispatching a focus loss, check if the following conditions are met: // before dispatching a focus loss, check if the following conditions are met:
// 1/ the framework is not supposed to notify the focus loser on a DUCK loss // 1/ the framework is not supposed to notify the focus loser on a DUCK loss
// (i.e. it has a focus controller that implements a ducking policy)
// 2/ it is a DUCK loss // 2/ it is a DUCK loss
// 3/ the focus loser isn't flagged as pausing in a DUCK loss // 3/ the focus loser isn't flagged as pausing in a DUCK loss
// if they are, do not notify the focus loser // if they are, do not notify the focus loser
@@ -365,7 +366,14 @@ public class FocusRequester {
&& fr != null) { && fr != null) {
// candidate for enforcement by the framework // candidate for enforcement by the framework
if (fr.mCallingUid != this.mCallingUid) { if (fr.mCallingUid != this.mCallingUid) {
handled = mFocusController.duckPlayers(fr, this); if ((mGrantFlags
& AudioManager.AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS) != 0) {
// the focus loser declared it would pause instead of duck, let it
// handle it (the framework doesn't pause for apps)
handled = false;
} else {
handled = mFocusController.duckPlayers(fr, this);
}
} // else: the focus change is within the same app, so let the dispatching } // else: the focus change is within the same app, so let the dispatching
// happen as if the framework was not involved. // happen as if the framework was not involved.
} }