diff options
3 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index feb9b4f2664d..d73f0cca9a4e 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -2539,7 +2539,8 @@ public class ActivityOptions extends ComponentOptions { public String toString() { return "ActivityOptions(" + hashCode() + "), mPackageName=" + mPackageName + ", mAnimationType=" + mAnimationType + ", mStartX=" + mStartX + ", mStartY=" - + mStartY + ", mWidth=" + mWidth + ", mHeight=" + mHeight; + + mStartY + ", mWidth=" + mWidth + ", mHeight=" + mHeight + ", mLaunchDisplayId=" + + mLaunchDisplayId; } /** diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java index 80d1e1683de1..a757d90b75ba 100644 --- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java @@ -1155,6 +1155,8 @@ class ActivityMetricsLogger { sb.setLength(0); sb.append("Displayed "); sb.append(info.launchedActivityShortComponentName); + sb.append(" for user "); + sb.append(info.userId); sb.append(": "); TimeUtils.formatDuration(info.windowsDrawnDelayMs, sb); Log.i(TAG, sb.toString()); diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java index dda0d6c3c3f2..b38666522754 100644 --- a/services/core/java/com/android/server/wm/RecentTasks.java +++ b/services/core/java/com/android/server/wm/RecentTasks.java @@ -976,9 +976,10 @@ class RecentTasks { if (!task.mUserSetupComplete) { // Don't include task launched while user is not done setting-up. - if (DEBUG_RECENTS) { - Slog.d(TAG_RECENTS, "Skipping, user setup not complete: " + task); - } + + // NOTE: not guarding with DEBUG_RECENTS as it's not frequent enough to spam logcat, + // but is useful when running CTS. + Slog.d(TAG_RECENTS, "Skipping, user setup not complete: " + task); continue; } |