Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f789610 authored by Perry Wu's avatar Perry Wu Committed by Automerger Merge Worker
Browse files

Merge "Add EventLog for entering PIP with AutoEnter param" into udc-dev am:... 

Merge "Add EventLog for entering PIP with AutoEnter param" into udc-dev am: 5f2cfdc2 am: 5143b7db

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23355538



Change-Id: I0d1f2363e9f60b3f425684d3e5b873e3425d2a03
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c91e521b 5143b7db

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

+2 −0
Original line number Diff line number Diff line
@@ -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,

services/core/java/com/android/server/wm/EventLogTags.logtags

+3 −0
Original line number Diff line number Diff line
@@ -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)