OSDN Git Service

AudioService dump: sort player piids
authorJean-Michel Trivi <jmtrivi@google.com>
Tue, 18 Jul 2017 21:53:40 +0000 (14:53 -0700)
committerJean-Michel Trivi <jmtrivi@google.com>
Wed, 19 Jul 2017 01:24:55 +0000 (18:24 -0700)
In AudioService dump, sort player piids (the lower the piid the
  older the player).

Test: adb shell dumpsys audio
Change-Id: Icebb35f8034bd26a9cafc685594a3390d19d07fa

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

index 663559f..9ef45ea 100644 (file)
@@ -34,6 +34,7 @@ import com.android.internal.util.ArrayUtils;
 import java.io.PrintWriter;
 import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -224,11 +225,18 @@ public final class PlaybackActivityMonitor
         pw.println("\nPlaybackActivityMonitor dump time: "
                 + DateFormat.getTimeInstance().format(new Date()));
         synchronized(mPlayerLock) {
-            for (AudioPlaybackConfiguration conf : mPlayers.values()) {
-                conf.dump(pw);
+            // all players
+            pw.println("\n  players:");
+            final List<Integer> piidIntList = new ArrayList<Integer>(mPlayers.keySet());
+            Collections.sort(piidIntList);
+            for (Integer piidInt : piidIntList) {
+                final AudioPlaybackConfiguration apc = mPlayers.get(piidInt);
+                if (apc != null) {
+                    apc.dump(pw);
+                }
             }
             // ducked players
-            pw.println("\n  ducked players:");
+            pw.println("\n  ducked players piids:");
             mDuckingManager.dump(pw);
             // players muted due to the device ringing or being in a call
             pw.print("\n  muted player piids:");