Dump the persistent activities map from CarLaunchParamsModifierUpdatableImpl and CarActivityInterceptorUpdatableImpl

Bug: 280358563

Test: adb shell dumpsys > log.txt
      Search for CarActivityInterceptorUpdatableImpl and CarLaunchParamsModifierUpdatableImpl
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c90c7f2354ef0ae2ba5cccee1db9b61da43916c9)
Change-Id: Icd13059f5db69de6e9d660b98f5a08b2c5b8f5ea

5 files changed, 63 insertions, 2 deletions

diff --git a/builtInServices/api/module-lib-current.txt b/builtInServices/api/module-lib-current.txt
index ed6de32..e625c2e 100644
--- a/builtInServices/api/module-lib-current.txt
+++ b/builtInServices/api/module-lib-current.txt
@@ -118,6 +118,7 @@ package com.android.server.wm {
 
   public final class TaskDisplayAreaWrapper {
     method public android.view.Display getDisplay();
+    method public int getFeatureId();
   }
 
   public final class TaskWrapper {
diff --git a/builtInServices/src/com/android/server/wm/TaskDisplayAreaWrapper.java b/builtInServices/src/com/android/server/wm/TaskDisplayAreaWrapper.java
index 65c7ef3..5617ad3 100644
--- a/builtInServices/src/com/android/server/wm/TaskDisplayAreaWrapper.java
+++ b/builtInServices/src/com/android/server/wm/TaskDisplayAreaWrapper.java
@@ -56,6 +56,13 @@ public final class TaskDisplayAreaWrapper {
         return mTaskDisplayArea.mDisplayContent.getDisplay();
     }
 
+    /**
+     * Gets the feature Id for this {@link TaskDisplayAreaWrapper}.
+     */
+    public int getFeatureId() {
+        return mTaskDisplayArea.mFeatureId;
+    }
+
     @Override
     public String toString() {
         return mTaskDisplayArea.toString();
diff --git a/updatableServices/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImpl.java b/updatableServices/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImpl.java
index 5e6a746..a079414 100644
--- a/updatableServices/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImpl.java
+++ b/updatableServices/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImpl.java
@@ -308,7 +308,10 @@ public final class CarServiceHelperServiceUpdatableImpl
             return;
         }
 
-        mCarServiceProxy.dump(new IndentingPrintWriter(writer));
+        IndentingPrintWriter pw = new IndentingPrintWriter(writer);
+        mCarServiceProxy.dump(pw);
+        mCarLaunchParamsModifierUpdatable.dump(pw);
+        mCarActivityInterceptorUpdatable.dump(pw);
     }
 
     @VisibleForTesting
diff --git a/updatableServices/src/com/android/server/wm/CarActivityInterceptorUpdatableImpl.java b/updatableServices/src/com/android/server/wm/CarActivityInterceptorUpdatableImpl.java
index ee0d999..1cb925d 100644
--- a/updatableServices/src/com/android/server/wm/CarActivityInterceptorUpdatableImpl.java
+++ b/updatableServices/src/com/android/server/wm/CarActivityInterceptorUpdatableImpl.java
@@ -29,6 +29,7 @@ import android.os.RemoteException;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 
+import com.android.car.internal.util.IndentingPrintWriter;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 
@@ -165,4 +166,26 @@ public final class CarActivityInterceptorUpdatableImpl implements CarActivityInt
             return mActivityToRootTaskMap;
         }
     }
+
+    /**
+     * Dump {code CarActivityInterceptorUpdatableImpl#mActivityToRootTaskMap}
+     */
+    public void dump(IndentingPrintWriter writer) {
+        writer.println(TAG);
+        writer.increaseIndent();
+        writer.println("Activity to root task map:");
+        writer.increaseIndent();
+        synchronized (mLock) {
+            if (mActivityToRootTaskMap.size() == 0) {
+                writer.println("No activity persisted on a root task");
+            } else {
+                for (int i = 0; i < mActivityToRootTaskMap.size(); i++) {
+                    writer.println("Activity name: " + mActivityToRootTaskMap.keyAt(i)
+                            + " - Binder object: " + mActivityToRootTaskMap.valueAt(i));
+                }
+            }
+        }
+        writer.decreaseIndent();
+        writer.decreaseIndent();
+    }
 }
diff --git a/updatableServices/src/com/android/server/wm/CarLaunchParamsModifierUpdatableImpl.java b/updatableServices/src/com/android/server/wm/CarLaunchParamsModifierUpdatableImpl.java
index a5e79b9..0be52fb 100644
--- a/updatableServices/src/com/android/server/wm/CarLaunchParamsModifierUpdatableImpl.java
+++ b/updatableServices/src/com/android/server/wm/CarLaunchParamsModifierUpdatableImpl.java
@@ -37,6 +37,7 @@ import android.util.Pair;
 import android.util.SparseIntArray;
 import android.view.Display;
 
+import com.android.car.internal.util.IndentingPrintWriter;
 import com.android.car.internal.util.VersionUtils;
 import com.android.internal.annotations.GuardedBy;
 
@@ -53,7 +54,7 @@ import java.util.List;
 @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
 public final class CarLaunchParamsModifierUpdatableImpl
         implements CarLaunchParamsModifierUpdatable {
-    private static final String TAG = "CAR.LAUNCH";
+    private static final String TAG = CarLaunchParamsModifierUpdatableImpl.class.getSimpleName();
     private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
     // Comes from android.os.UserHandle.USER_NULL.
     private static final int USER_NULL = -10000;
@@ -518,4 +519,30 @@ public final class CarLaunchParamsModifierUpdatableImpl
         }
         return CarActivityManager.RESULT_SUCCESS;
     }
+
+    /**
+     * Dump {code CarLaunchParamsModifierUpdatableImpl#mPersistentActivities}
+     */
+    public void dump(IndentingPrintWriter writer) {
+        writer.println(TAG);
+        writer.increaseIndent();
+        writer.println("Persistent Activities:");
+        writer.increaseIndent();
+        synchronized (mLock) {
+            if (mPersistentActivities.size() == 0) {
+                writer.println("No activity persisted on a task display area");
+            } else {
+                for (int i = 0; i < mPersistentActivities.size(); i++) {
+                    TaskDisplayAreaWrapper taskDisplayAreaWrapper =
+                            mPersistentActivities.valueAt(i);
+                    writer.println(
+                            "Activity name: " + mPersistentActivities.keyAt(i) + " - Display ID: "
+                                    + taskDisplayAreaWrapper.getDisplay().getDisplayId()
+                                    + " , Feature ID: " + taskDisplayAreaWrapper.getFeatureId());
+                }
+            }
+        }
+        writer.decreaseIndent();
+        writer.decreaseIndent();
+    }
 }