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

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

Merge "AudioService: Add the AudioDeviceBroker's message queue to the dump" 

am: dab4c89c

Change-Id: I642e4ebf5f792dfa9933514356e7b8bf28a020cc
parents a7d5a322 dab4c89c

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

+11 −0
Original line number Diff line number Diff line
@@ -40,9 +40,11 @@ import android.os.PowerManager; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.util.Log;

import android.util.PrintWriterPrinter;



import com.android.internal.annotations.GuardedBy;



import java.io.PrintWriter;



/** @hide */

/*package*/ final class AudioDeviceBroker {
@@ -597,6 +599,15 @@ import com.android.internal.annotations.GuardedBy; 
        }

    }



    /*package*/ void dump(PrintWriter pw, String prefix) {

        if (mBrokerHandler != null) {

            pw.println(prefix + "Message handler (watch for unhandled messages):");

            mBrokerHandler.dump(new PrintWriterPrinter(pw), prefix + "  ");

        } else {

            pw.println("Message handler is null");

        }

    }



    //---------------------------------------------------------------------

    // Internal handling of messages

    // These methods are ALL synchronous, in response to message handling in BrokerHandler

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

+3 −2
Original line number Diff line number Diff line
@@ -6417,11 +6417,12 @@ public class AudioService extends IAudioService.Stub 


        dumpAudioPolicies(pw);

        mDynPolicyLogger.dump(pw);



        mPlaybackMonitor.dump(pw);



        mRecordMonitor.dump(pw);



        pw.println("\nAudioDeviceBroker:");

        mDeviceBroker.dump(pw, "  ");



        pw.println("\n");

        pw.println("\nEvent logs:");

        mModeLogger.dump(pw);