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

Commit a5c8499e authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Audio service: always unduck focus winner" into oc-dev am: a78b6e77 

am: 87c49233

Change-Id: I5af140a52e428cf9c2ef8b0501e86d12295e1a30
parents 5e7a07a3 87c49233

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

+1 −3
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ public class FocusRequester { 
     */

    void handleFocusGain(int focusGain) {

        try {

            final int oldLoss = mFocusLossReceived;

            mFocusLossReceived = AudioManager.AUDIOFOCUS_NONE;

            mFocusController.notifyExtPolicyFocusGrant_syncAf(toAudioFocusInfo(),

                    AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
@@ -322,9 +321,8 @@ public class FocusRequester { 
                }

                if (mFocusLossWasNotified) {

                    fd.dispatchAudioFocusChange(focusGain, mClientId);

                } else if (oldLoss == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK) {

                    mFocusController.unduckPlayers(this);

                }

                mFocusController.unduckPlayers(this);

            }

            mFocusLossWasNotified = false;

        } catch (android.os.RemoteException e) {