From a097bca2b0fff45b5cff4b5f434bc7cee6d4e37c Mon Sep 17 00:00:00 2001 From: Perry Wu Date: Fri, 19 May 2023 20:24:17 +0000 Subject: [PATCH] Add EventLog for entering PIP with AutoEnter param Adds an EventLog for when we enter PIP and whether auto enter was enabled. We can use the existing wm_pause_activity to check for failures when entering PIP. Test: manual Bug: 282200851 Change-Id: I6f40d6b0079baa5ac0823e32f21e836c39f0ccc7 --- .../java/com/android/server/wm/ActivityTaskManagerService.java | 2 ++ services/core/java/com/android/server/wm/EventLogTags.logtags | 3 +++ 2 files changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 750ed986f5673..89862918744cd 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -3649,6 +3649,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { Slog.e(TAG, "Skip enterPictureInPictureMode, destroyed " + r); return; } + EventLogTags.writeWmEnterPip(r.mUserId, System.identityHashCode(r), + r.shortComponentName, Boolean.toString(isAutoEnter)); r.setPictureInPictureParams(params); r.mAutoEnteringPip = isAutoEnter; mRootWindowContainer.moveActivityToPinnedRootTask(r, diff --git a/services/core/java/com/android/server/wm/EventLogTags.logtags b/services/core/java/com/android/server/wm/EventLogTags.logtags index 244656ca68e61..d957591ab7f92 100644 --- a/services/core/java/com/android/server/wm/EventLogTags.logtags +++ b/services/core/java/com/android/server/wm/EventLogTags.logtags @@ -80,3 +80,6 @@ option java_package com.android.server.wm # Request surface flinger to show / hide the wallpaper surface. 33001 wm_wallpaper_surface (Display Id|1|5),(Visible|1),(Target|3) + +# Entering pip called +38000 wm_enter_pip (User|1|5),(Token|1|5),(Component Name|3),(is Auto Enter|3)