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

Commit 24da7bba authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Audio focus: uid/pid log info on focus request/abandon"

parents 010278d9 40399053

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

+8 −3
Original line number Original line Diff line number Diff line
@@ -387,8 +387,11 @@ public class MediaFocusControl { 
    /** @see AudioManager#requestAudioFocus(AudioManager.OnAudioFocusChangeListener, int, int, int) */

    /** @see AudioManager#requestAudioFocus(AudioManager.OnAudioFocusChangeListener, int, int, int) */

    protected int requestAudioFocus(AudioAttributes aa, int focusChangeHint, IBinder cb,

    protected int requestAudioFocus(AudioAttributes aa, int focusChangeHint, IBinder cb,

            IAudioFocusDispatcher fd, String clientId, String callingPackageName, int flags) {

            IAudioFocusDispatcher fd, String clientId, String callingPackageName, int flags) {

        Log.i(TAG, " AudioFocus  requestAudioFocus() from " + clientId + " req=" + focusChangeHint +

        Log.i(TAG, " AudioFocus  requestAudioFocus() from uid/pid " + Binder.getCallingUid()

                "flags=0x" + Integer.toHexString(flags));

                + "/" + Binder.getCallingPid()

                + " clientId=" + clientId

                + " req=" + focusChangeHint

                + " flags=0x" + Integer.toHexString(flags));

        // we need a valid binder callback for clients

        // we need a valid binder callback for clients

        if (!cb.pingBinder()) {

        if (!cb.pingBinder()) {

            Log.e(TAG, " AudioFocus DOA client for requestAudioFocus(), aborting.");

            Log.e(TAG, " AudioFocus DOA client for requestAudioFocus(), aborting.");
@@ -481,7 +484,9 @@ public class MediaFocusControl { 
     * */

     * */

    protected int abandonAudioFocus(IAudioFocusDispatcher fl, String clientId, AudioAttributes aa) {

    protected int abandonAudioFocus(IAudioFocusDispatcher fl, String clientId, AudioAttributes aa) {

        // AudioAttributes are currently ignored, to be used for zones

        // AudioAttributes are currently ignored, to be used for zones

        Log.i(TAG, " AudioFocus  abandonAudioFocus() from " + clientId);

        Log.i(TAG, " AudioFocus  abandonAudioFocus() from uid/pid " + Binder.getCallingUid()

                + "/" + Binder.getCallingPid()

                + " clientId=" + clientId);

        try {

        try {

            // this will take care of notifying the new focus owner if needed

            // this will take care of notifying the new focus owner if needed

            synchronized(mAudioFocusLock) {

            synchronized(mAudioFocusLock) {