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

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

Browse Source 
am: 58e105da75

Change-Id: I27df8c162bb413f70eb4d7ad0bc9665c6d03d3df
This commit is contained in:
Jean-Michel Trivi
2019-09-10 08:51:30 -07:00
committed by android-build-merger
parent 00ef00f336 58e105da75
commit f74a3c9225
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/audio/AudioDeviceBroker.java
View File

@@ -37,9 +37,11 @@ import android.os.PowerManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import android.util.PrintWriterPrinter;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import java.io.PrintWriter;
/** @hide */ /** @hide */
/*package*/ final class AudioDeviceBroker { /*package*/ final class AudioDeviceBroker {
@@ -622,6 +624,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 // Internal handling of messages
// These methods are ALL synchronous, in response to message handling in BrokerHandler // These methods are ALL synchronous, in response to message handling in BrokerHandler

5
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -6441,11 +6441,12 @@ public class AudioService extends IAudioService.Stub
dumpAudioPolicies(pw); dumpAudioPolicies(pw);
mDynPolicyLogger.dump(pw); mDynPolicyLogger.dump(pw);
mPlaybackMonitor.dump(pw); mPlaybackMonitor.dump(pw);
mRecordMonitor.dump(pw); mRecordMonitor.dump(pw);
pw.println("\nAudioDeviceBroker:");
mDeviceBroker.dump(pw, " ");
pw.println("\n"); pw.println("\n");
pw.println("\nEvent logs:"); pw.println("\nEvent logs:");
mModeLogger.dump(pw); mModeLogger.dump(pw);