commit 268eccbd1e191f7c1780348837d03d71b43e65db
author Winson Chung <winsonc@google.com> Thu Mar 26 13:43:44 2020 -0700
committer Winson Chung <winsonc@google.com> Fri Mar 27 23:44:57 2020 -0700
tree 4685fad5f44e075d0a3f455df0fa8323c3107530
parent 03eb7a1bf28253b61b3e47a17d2fccd12ba401fb

Adding task org controller dump

Bug: 148977538
Test: adb shell dumpsys activity activities
Change-Id: I285034a6defbdb56d67b5b52db0d1426781afb57

services/core/java/com/android/server/wm/TaskOrganizerController.java

diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java
index 8a896f5..f4f8262 100644
--- a/services/core/java/com/android/server/wm/TaskOrganizerController.java
+++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java
@@ -32,6 +32,7 @@
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.util.Slog;
 import android.util.SparseArray;
 import android.window.ITaskOrganizer;
@@ -40,10 +41,12 @@
 
 import com.android.internal.util.ArrayUtils;
 
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.WeakHashMap;
 
 /**
@@ -84,8 +87,9 @@
         private final ITaskOrganizer mOrganizer;
         private final DeathRecipient mDeathRecipient;
         private final ArrayList<Task> mOrganizedTasks = new ArrayList<>();
+        private final int mUid;
 
-        TaskOrganizerState(ITaskOrganizer organizer) {
+        TaskOrganizerState(ITaskOrganizer organizer, int uid) {
             mOrganizer = organizer;
             mDeathRecipient = new DeathRecipient(organizer);
             try {
@@ -93,6 +97,7 @@
             } catch (RemoteException e) {
                 Slog.e(TAG, "TaskOrganizer failed to register death recipient");
             }
+            mUid = uid;
         }
 
         void addTask(Task t) {
@@ -179,6 +184,7 @@
                     + " windowing modes are supported for registerTaskOrganizer");
         }
         enforceStackPermission("registerTaskOrganizer()");
+        final int uid = Binder.getCallingUid();
         final long origId = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -195,7 +201,7 @@
                 orgs.add(organizer.asBinder());
                 if (!mTaskOrganizerStates.containsKey(organizer.asBinder())) {
                     mTaskOrganizerStates.put(organizer.asBinder(),
-                            new TaskOrganizerState(organizer));
+                            new TaskOrganizerState(organizer, uid));
                 }
 
                 if (orgs.size() == 1) {
@@ -466,4 +472,27 @@
             Binder.restoreCallingIdentity(ident);
         }
     }
+
+    public void dump(PrintWriter pw, String prefix) {
+        final String innerPrefix = prefix + "  ";
+        pw.print(prefix); pw.println("TaskOrganizerController:");
+        pw.print(innerPrefix); pw.println("Per windowing mode:");
+        for (int i = 0; i < mTaskOrganizersForWindowingMode.size(); i++) {
+            final int windowingMode = mTaskOrganizersForWindowingMode.keyAt(i);
+            final List<IBinder> taskOrgs = mTaskOrganizersForWindowingMode.valueAt(i);
+            pw.println(innerPrefix + "  "
+                    + WindowConfiguration.windowingModeToString(windowingMode) + ":");
+            for (int j = 0; j < taskOrgs.size(); j++) {
+                final TaskOrganizerState state =  mTaskOrganizerStates.get(taskOrgs.get(j));
+                final ArrayList<Task> tasks = state.mOrganizedTasks;
+                pw.print(innerPrefix + "    ");
+                pw.println(state.mOrganizer + " uid=" + state.mUid + ":");
+                for (int k = 0; k < tasks.size(); k++) {
+                    pw.println(innerPrefix + "      " + tasks.get(k));
+                }
+            }
+
+        }
+        pw.println();
+    }
 }