diff options
| author | 2022-03-04 16:37:20 +0000 | |
|---|---|---|
| committer | 2022-03-04 16:37:20 +0000 | |
| commit | 6382d7cac3bf7a2f056e2a765df8fdd068c11040 (patch) | |
| tree | ad8f393bcf36ff707becd1091fe94742c44b0afc | |
| parent | 343ed80b9f7cefb7009c4029d0a48586413773e2 (diff) | |
| parent | 1153c8f352fc2fb2997583146f6be0486e98ce5c (diff) | |
Merge "Add window_frames_valid to proto" into tm-dev
| -rw-r--r-- | core/proto/android/server/windowmanagerservice.proto | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index 3929027a4e94..0ade0934f2a6 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -53,6 +53,7 @@ message WindowManagerServiceDumpProto { optional int32 last_orientation = 8 [(.android.typedef) = "android.content.pm.ActivityInfo.ScreenOrientation", deprecated=true]; optional int32 focused_display_id = 9; optional bool hard_keyboard_available = 10; + optional bool window_frames_valid = 11; } /* represents RootWindowContainer object */ diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 555128bc1374..2cff03089234 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -141,6 +141,7 @@ import static com.android.server.wm.WindowManagerServiceDumpProto.HARD_KEYBOARD_ import static com.android.server.wm.WindowManagerServiceDumpProto.INPUT_METHOD_WINDOW; import static com.android.server.wm.WindowManagerServiceDumpProto.POLICY; import static com.android.server.wm.WindowManagerServiceDumpProto.ROOT_WINDOW_CONTAINER; +import static com.android.server.wm.WindowManagerServiceDumpProto.WINDOW_FRAMES_VALID; import android.Manifest; import android.Manifest.permission; @@ -6437,9 +6438,13 @@ public class WindowManagerService extends IWindowManager.Stub imeWindow.writeIdentifierToProto(proto, INPUT_METHOD_WINDOW); } proto.write(DISPLAY_FROZEN, mDisplayFrozen); - final DisplayContent defaultDisplayContent = getDefaultDisplayContentLocked(); proto.write(FOCUSED_DISPLAY_ID, topFocusedDisplayContent.getDisplayId()); proto.write(HARD_KEYBOARD_AVAILABLE, mHardKeyboardAvailable); + + // This is always true for now since we still update the window frames at the server side. + // Once we move the window layout to the client side, this can be false when we are waiting + // for the frames. + proto.write(WINDOW_FRAMES_VALID, true); } private void dumpWindowsLocked(PrintWriter pw, boolean dumpAll, |