diff options
| author | 2022-09-02 01:48:57 +0000 | |
|---|---|---|
| committer | 2022-09-02 01:48:57 +0000 | |
| commit | 47653ee99dee2dbea5251e9c4cdec27c7cedf070 (patch) | |
| tree | 22085a554e10b41030cba860317ea58432284d3b | |
| parent | ff525f47488287b6f2104320c73d005763afcb9a (diff) | |
| parent | dd8d8be35c6aad18f2861119c8b82b652d355a21 (diff) | |
Merge "Expose state of ignoring orientation"
| -rw-r--r-- | core/proto/android/server/windowmanagerservice.proto | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayArea.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index 152d729da3b6..149db319a82e 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -241,6 +241,7 @@ message DisplayAreaProto { optional bool is_root_display_area = 5; optional int32 feature_id = 6; optional bool is_organized = 7; + optional bool is_ignoring_orientation_request = 8; } /* represents a generic child of a DisplayArea */ diff --git a/services/core/java/com/android/server/wm/DisplayArea.java b/services/core/java/com/android/server/wm/DisplayArea.java index 863782a4316e..daa121611516 100644 --- a/services/core/java/com/android/server/wm/DisplayArea.java +++ b/services/core/java/com/android/server/wm/DisplayArea.java @@ -26,6 +26,7 @@ import static android.window.DisplayAreaOrganizer.FEATURE_WINDOW_TOKENS; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ORIENTATION; import static com.android.internal.util.Preconditions.checkState; import static com.android.server.wm.DisplayAreaProto.FEATURE_ID; +import static com.android.server.wm.DisplayAreaProto.IS_IGNORING_ORIENTATION_REQUEST; import static com.android.server.wm.DisplayAreaProto.IS_ORGANIZED; import static com.android.server.wm.DisplayAreaProto.IS_ROOT_DISPLAY_AREA; import static com.android.server.wm.DisplayAreaProto.IS_TASK_DISPLAY_AREA; @@ -291,6 +292,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { proto.write(IS_ROOT_DISPLAY_AREA, asRootDisplayArea() != null); proto.write(FEATURE_ID, mFeatureId); proto.write(IS_ORGANIZED, isOrganized()); + proto.write(IS_IGNORING_ORIENTATION_REQUEST, getIgnoreOrientationRequest()); proto.end(token); } |