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

Commit 3e21741e authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Automerger Merge Worker
Browse files

Merge "Add compat info to WindowManager proto dump" into sc-dev am: d358a9f6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib692c99349e5388139f07145c6033fc9b9bee2dd
parents 7d09ac4f d358a9f6

core/proto/android/server/windowmanagerservice.proto

+3 −0
Original line number Original line Diff line number Diff line
@@ -406,6 +406,8 @@ message WindowStateProto { 
    optional int64 finished_seamless_rotation_frame = 40;

    optional int64 finished_seamless_rotation_frame = 40;

    optional WindowFramesProto window_frames = 41;

    optional WindowFramesProto window_frames = 41;

    optional bool force_seamless_rotation = 42;

    optional bool force_seamless_rotation = 42;

    optional bool in_size_compat_mode = 43;

    optional float global_scale = 44;

}

}





message IdentifierProto {

message IdentifierProto {
@@ -516,6 +518,7 @@ message WindowFramesProto { 
    optional .android.graphics.RectProto visible_insets = 13 [deprecated=true];

    optional .android.graphics.RectProto visible_insets = 13 [deprecated=true];

    optional .android.graphics.RectProto stable_insets = 14 [deprecated=true];

    optional .android.graphics.RectProto stable_insets = 14 [deprecated=true];

    optional .android.graphics.RectProto outsets = 15;

    optional .android.graphics.RectProto outsets = 15;

    optional .android.graphics.RectProto compat_frame = 16;

}

}





message InsetsSourceProviderProto {

message InsetsSourceProviderProto {

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.server.wm;

package com.android.server.wm;





import static com.android.server.wm.WindowFramesProto.COMPAT_FRAME;

import static com.android.server.wm.WindowFramesProto.CONTAINING_FRAME;

import static com.android.server.wm.WindowFramesProto.CONTAINING_FRAME;

import static com.android.server.wm.WindowFramesProto.DISPLAY_FRAME;

import static com.android.server.wm.WindowFramesProto.DISPLAY_FRAME;

import static com.android.server.wm.WindowFramesProto.FRAME;

import static com.android.server.wm.WindowFramesProto.FRAME;
@@ -177,7 +178,7 @@ public class WindowFrames { 
        mDisplayFrame.dumpDebug(proto, DISPLAY_FRAME);

        mDisplayFrame.dumpDebug(proto, DISPLAY_FRAME);

        mContainingFrame.dumpDebug(proto, CONTAINING_FRAME);

        mContainingFrame.dumpDebug(proto, CONTAINING_FRAME);

        mFrame.dumpDebug(proto, FRAME);

        mFrame.dumpDebug(proto, FRAME);



        mCompatFrame.dumpDebug(proto, COMPAT_FRAME);

        proto.end(token);

        proto.end(token);

    }

    }

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -169,7 +169,9 @@ import static com.android.server.wm.WindowStateProto.DISPLAY_ID; 
import static com.android.server.wm.WindowStateProto.FINISHED_SEAMLESS_ROTATION_FRAME;

import static com.android.server.wm.WindowStateProto.FINISHED_SEAMLESS_ROTATION_FRAME;

import static com.android.server.wm.WindowStateProto.FORCE_SEAMLESS_ROTATION;

import static com.android.server.wm.WindowStateProto.FORCE_SEAMLESS_ROTATION;

import static com.android.server.wm.WindowStateProto.GIVEN_CONTENT_INSETS;

import static com.android.server.wm.WindowStateProto.GIVEN_CONTENT_INSETS;

import static com.android.server.wm.WindowStateProto.GLOBAL_SCALE;

import static com.android.server.wm.WindowStateProto.HAS_SURFACE;

import static com.android.server.wm.WindowStateProto.HAS_SURFACE;

import static com.android.server.wm.WindowStateProto.IN_SIZE_COMPAT_MODE;

import static com.android.server.wm.WindowStateProto.IS_ON_SCREEN;

import static com.android.server.wm.WindowStateProto.IS_ON_SCREEN;

import static com.android.server.wm.WindowStateProto.IS_READY_FOR_DISPLAY;

import static com.android.server.wm.WindowStateProto.IS_READY_FOR_DISPLAY;

import static com.android.server.wm.WindowStateProto.IS_VISIBLE;

import static com.android.server.wm.WindowStateProto.IS_VISIBLE;
@@ -4002,6 +4004,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        proto.write(PENDING_SEAMLESS_ROTATION, mPendingSeamlessRotate != null);

        proto.write(PENDING_SEAMLESS_ROTATION, mPendingSeamlessRotate != null);

        proto.write(FINISHED_SEAMLESS_ROTATION_FRAME, mFinishSeamlessRotateFrameNumber);

        proto.write(FINISHED_SEAMLESS_ROTATION_FRAME, mFinishSeamlessRotateFrameNumber);

        proto.write(FORCE_SEAMLESS_ROTATION, mForceSeamlesslyRotate);

        proto.write(FORCE_SEAMLESS_ROTATION, mForceSeamlesslyRotate);

        proto.write(IN_SIZE_COMPAT_MODE, inSizeCompatMode());

        proto.write(GLOBAL_SCALE, mGlobalScale);

        proto.end(token);

        proto.end(token);

    }

    }