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

Commit 81bafbed authored by Vlad Popa's avatar Vlad Popa
Browse files

Fix dump when mute state not set 

When mute state is not set the invalid value stored in
AudioPlaybackConfiguration is -1. This has a bitmask of 0x111.. and
previously returned true for all mute reasons.

Changed the dump of the mute state to print only the attributes
that lead to the muting of the track.

Test: dumpsys audio
Bug: 235521198
Change-Id: I741927ff14c12c2efd550f3fe61551d20239f8c0
parent 888772b3

media/java/android/media/AudioPlaybackConfiguration.java

+33 −15
Original line number Diff line number Diff line
@@ -677,21 +677,39 @@ public final class AudioPlaybackConfiguration implements Parcelable { 


    @Override

    public String toString() {

        return "AudioPlaybackConfiguration piid:" + mPlayerIId

                + " deviceId:" + mDeviceId

                + " type:" + toLogFriendlyPlayerType(mPlayerType)

                + " u/pid:" + mClientUid + "/" + mClientPid

                + " state:" + toLogFriendlyPlayerState(mPlayerState)

                + " attr:" + mPlayerAttr

                + " sessionId:" + mSessionId

                + " mutedState:"

                + " muteFromMasterMute=" + ((mMutedState & PLAYER_MUTE_MASTER) != 0)

                + " muteFromStreamVolume=" + ((mMutedState & PLAYER_MUTE_STREAM_VOLUME) != 0)

                + " muteFromStreamMuted=" + ((mMutedState & PLAYER_MUTE_STREAM_MUTED) != 0)

                + " muteFromPlaybackRestricted=" + ((mMutedState & PLAYER_MUTE_PLAYBACK_RESTRICTED)

                != 0)

                + " muteFromClientVolume=" + ((mMutedState & PLAYER_MUTE_CLIENT_VOLUME) != 0)

                + " muteFromVolumeShaper=" + ((mMutedState & PLAYER_MUTE_VOLUME_SHAPER) != 0);

        StringBuilder apcToString = new StringBuilder();

        apcToString.append("AudioPlaybackConfiguration piid:").append(mPlayerIId).append(

                " deviceId:").append(mDeviceId).append(" type:").append(

                toLogFriendlyPlayerType(mPlayerType)).append(" u/pid:").append(mClientUid).append(

                "/").append(mClientPid).append(" state:").append(

                toLogFriendlyPlayerState(mPlayerState)).append(" attr:").append(mPlayerAttr).append(

                " sessionId:").append(mSessionId).append(" mutedState:");

        if (mMutedState == PLAYER_MUTE_INVALID) {

            apcToString.append("invalid ");

        } else if (mMutedState == 0) {

            apcToString.append("none ");

        } else {

            if ((mMutedState & PLAYER_MUTE_MASTER) != 0) {

                apcToString.append("master ");

            }

            if ((mMutedState & PLAYER_MUTE_STREAM_VOLUME) != 0) {

                apcToString.append("streamVolume ");

            }

            if ((mMutedState & PLAYER_MUTE_STREAM_MUTED) != 0) {

                apcToString.append("streamMute ");

            }

            if ((mMutedState & PLAYER_MUTE_PLAYBACK_RESTRICTED) != 0) {

                apcToString.append("playbackRestricted ");

            }

            if ((mMutedState & PLAYER_MUTE_CLIENT_VOLUME) != 0) {

                apcToString.append("clientVolume ");

            }

            if ((mMutedState & PLAYER_MUTE_VOLUME_SHAPER) != 0) {

                apcToString.append("volumeShaper ");

            }

        }



        return apcToString.toString();

    }



    //=====================================================================

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

+23 −12
Original line number Diff line number Diff line
@@ -1150,18 +1150,29 @@ public final class PlaybackActivityMonitor 
                    }

                    return builder.toString();

                case AudioPlaybackConfiguration.PLAYER_UPDATE_MUTED:

                    builder.append(" muteFromMasterMute:").append(

                            (mEventValue & PLAYER_MUTE_MASTER) != 0);

                    builder.append(" muteFromStreamVolume:").append(

                            (mEventValue & PLAYER_MUTE_STREAM_VOLUME) != 0);

                    builder.append(" muteFromStreamMute:").append(

                            (mEventValue & PLAYER_MUTE_STREAM_MUTED) != 0);

                    builder.append(" muteFromPlaybackRestricted:").append(

                            (mEventValue & PLAYER_MUTE_PLAYBACK_RESTRICTED) != 0);

                    builder.append(" muteFromClientVolume:").append(

                            (mEventValue & PLAYER_MUTE_CLIENT_VOLUME) != 0);

                    builder.append(" muteFromVolumeShaper:").append(

                            (mEventValue & PLAYER_MUTE_VOLUME_SHAPER) != 0);

                    builder.append(" source:");

                    if (mEventValue <= 0) {

                        builder.append("none ");

                    } else {

                        if ((mEventValue & PLAYER_MUTE_MASTER) != 0) {

                            builder.append("masterMute ");

                        }

                        if ((mEventValue & PLAYER_MUTE_STREAM_VOLUME) != 0) {

                            builder.append("streamVolume ");

                        }

                        if ((mEventValue & PLAYER_MUTE_STREAM_MUTED) != 0) {

                            builder.append("streamMute ");

                        }

                        if ((mEventValue & PLAYER_MUTE_PLAYBACK_RESTRICTED) != 0) {

                            builder.append("playbackRestricted ");

                        }

                        if ((mEventValue & PLAYER_MUTE_CLIENT_VOLUME) != 0) {

                            builder.append("clientVolume ");

                        }

                        if ((mEventValue & PLAYER_MUTE_VOLUME_SHAPER) != 0) {

                            builder.append("volumeShaper ");

                        }

                    }

                    return builder.toString();

                default:

                    return builder.toString();