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

Commit e018573e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "WM tracing: use perfetto protos" into main

parents 743e80dc e529da48

core/java/android/app/WindowConfiguration.java

+9 −7
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
package android.app;



import static android.app.ActivityThread.isSystem;

import static android.app.WindowConfigurationProto.ACTIVITY_TYPE;

import static android.app.WindowConfigurationProto.APP_BOUNDS;

import static android.app.WindowConfigurationProto.BOUNDS;

import static android.app.WindowConfigurationProto.MAX_BOUNDS;

import static android.app.WindowConfigurationProto.WINDOWING_MODE;

import static android.internal.perfetto.protos.WindowConfiguration.WindowConfigurationProto.ACTIVITY_TYPE;

import static android.internal.perfetto.protos.WindowConfiguration.WindowConfigurationProto.APP_BOUNDS;

import static android.internal.perfetto.protos.WindowConfiguration.WindowConfigurationProto.BOUNDS;

import static android.internal.perfetto.protos.WindowConfiguration.WindowConfigurationProto.MAX_BOUNDS;

import static android.internal.perfetto.protos.WindowConfiguration.WindowConfigurationProto.WINDOWING_MODE;

import static android.view.Surface.rotationToString;



import android.annotation.IntDef;
@@ -715,7 +715,8 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 


    /**

     * Write to a protocol buffer output stream.

     * Protocol buffer message definition at {@link android.app.WindowConfigurationProto}

     * Protocol buffer message definition at

     * {@link android.internal.perfetto.protos.WindowConfiguration.WindowConfigurationProto}

     *

     * @param protoOutputStream Stream to write the WindowConfiguration object to.

     * @param fieldId           Field Id of the WindowConfiguration as defined in the parent message
@@ -735,7 +736,8 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 


    /**

     * Read from a protocol buffer input stream.

     * Protocol buffer message definition at {@link android.app.WindowConfigurationProto}

     * Protocol buffer message definition at

     * {@link android.internal.perfetto.protos.WindowConfiguration.WindowConfigurationProto}

     *

     * @param proto   Stream to read the WindowConfiguration object from.

     * @param fieldId Field Id of the WindowConfiguration as defined in the parent message

core/java/android/view/RemoteAnimationTarget.java

+14 −14
Original line number Diff line number Diff line
@@ -17,20 +17,20 @@ 
package android.view;



import static android.graphics.GraphicsProtos.dumpPointProto;

import static android.view.RemoteAnimationTargetProto.CLIP_RECT;

import static android.view.RemoteAnimationTargetProto.CONTENT_INSETS;

import static android.view.RemoteAnimationTargetProto.IS_TRANSLUCENT;

import static android.view.RemoteAnimationTargetProto.LEASH;

import static android.view.RemoteAnimationTargetProto.LOCAL_BOUNDS;

import static android.view.RemoteAnimationTargetProto.MODE;

import static android.view.RemoteAnimationTargetProto.POSITION;

import static android.view.RemoteAnimationTargetProto.PREFIX_ORDER_INDEX;

import static android.view.RemoteAnimationTargetProto.SCREEN_SPACE_BOUNDS;

import static android.view.RemoteAnimationTargetProto.SOURCE_CONTAINER_BOUNDS;

import static android.view.RemoteAnimationTargetProto.START_BOUNDS;

import static android.view.RemoteAnimationTargetProto.START_LEASH;

import static android.view.RemoteAnimationTargetProto.TASK_ID;

import static android.view.RemoteAnimationTargetProto.WINDOW_CONFIGURATION;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.CLIP_RECT;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.CONTENT_INSETS;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.IS_TRANSLUCENT;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.LEASH;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.LOCAL_BOUNDS;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.MODE;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.POSITION;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.PREFIX_ORDER_INDEX;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.SCREEN_SPACE_BOUNDS;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.SOURCE_CONTAINER_BOUNDS;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.START_BOUNDS;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.START_LEASH;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.TASK_ID;

import static android.internal.perfetto.protos.RemoteAnimationTarget.RemoteAnimationTargetProto.WINDOW_CONFIGURATION;

import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE;



import android.annotation.ColorInt;

graphics/java/android/graphics/GraphicsProtos.java

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.graphics;



import android.annotation.NonNull;

import android.internal.perfetto.protos.Point.PointProto;

import android.util.proto.ProtoOutputStream;



/**

services/core/java/com/android/server/policy/PhoneWindowManager.java

+10 −10
Original line number Diff line number Diff line
@@ -36,6 +36,16 @@ import static android.content.pm.PackageManager.FEATURE_LEANBACK; 
import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;

import static android.content.pm.PackageManager.FEATURE_WATCH;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.KEYGUARD_DELEGATE;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.KEYGUARD_DRAW_COMPLETE;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.KEYGUARD_OCCLUDED;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.KEYGUARD_OCCLUDED_CHANGED;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.KEYGUARD_OCCLUDED_PENDING;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.ORIENTATION;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.ROTATION;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.ROTATION_MODE;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.SCREEN_ON_FULLY;

import static android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto.WINDOW_MANAGER_DRAW_COMPLETE;

import static android.os.Build.VERSION_CODES.M;

import static android.os.Build.VERSION_CODES.O;

import static android.os.IInputConstants.INVALID_INPUT_DEVICE_ID;
@@ -96,16 +106,6 @@ import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.L 
import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_BEHAVIOR_SLEEP;

import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_CLOSED;

import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_OPEN;

import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_DELEGATE;

import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_DRAW_COMPLETE;

import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_OCCLUDED;

import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_OCCLUDED_CHANGED;

import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_OCCLUDED_PENDING;

import static com.android.server.wm.WindowManagerPolicyProto.ORIENTATION;

import static com.android.server.wm.WindowManagerPolicyProto.ROTATION;

import static com.android.server.wm.WindowManagerPolicyProto.ROTATION_MODE;

import static com.android.server.wm.WindowManagerPolicyProto.SCREEN_ON_FULLY;

import static com.android.server.wm.WindowManagerPolicyProto.WINDOW_MANAGER_DRAW_COMPLETE;

import static com.android.systemui.shared.Flags.enableLppAssistInvocationEffect;

import static com.android.systemui.shared.Flags.enableLppAssistInvocationHapticEffect;

import static com.android.window.flags.Flags.delegateBackGestureToShell;

services/core/java/com/android/server/policy/WindowManagerPolicy.java

+2 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,8 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 


    /**

     * Write the WindowManagerPolicy's state into the protocol buffer.

     * The message is described in {@link com.android.server.wm.WindowManagerPolicyProto}

     * The message is described in

     * {@link android.internal.perfetto.protos.Windowmanagerservice.WindowManagerPolicyProto}

     *

     * @param proto The protocol buffer output stream to write to.

     */