Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose state of ignoring orientation" am: 47653ee99d am: 4f49e133f6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2173785

Change-Id: I9f5321a37c9b37987591c9d6050ddfd18e8216bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-09-02 02:18:23 +00:00
committed by Automerger Merge Worker
parent 8c6ec7de71 4f49e133f6
commit 14ac88f4b5
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/proto/android/server/windowmanagerservice.proto
View File

@@ -241,6 +241,7 @@ message DisplayAreaProto {
optional bool is_root_display_area = 5; optional bool is_root_display_area = 5;
optional int32 feature_id = 6; optional int32 feature_id = 6;
optional bool is_organized = 7; optional bool is_organized = 7;
optional bool is_ignoring_orientation_request = 8;
} }
/* represents a generic child of a DisplayArea */ /* represents a generic child of a DisplayArea */

2
services/core/java/com/android/server/wm/DisplayArea.java
View File

@@ -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.protolog.ProtoLogGroup.WM_DEBUG_ORIENTATION;
import static com.android.internal.util.Preconditions.checkState; import static com.android.internal.util.Preconditions.checkState;
import static com.android.server.wm.DisplayAreaProto.FEATURE_ID; 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_ORGANIZED;
import static com.android.server.wm.DisplayAreaProto.IS_ROOT_DISPLAY_AREA; import static com.android.server.wm.DisplayAreaProto.IS_ROOT_DISPLAY_AREA;
import static com.android.server.wm.DisplayAreaProto.IS_TASK_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(IS_ROOT_DISPLAY_AREA, asRootDisplayArea() != null);
proto.write(FEATURE_ID, mFeatureId); proto.write(FEATURE_ID, mFeatureId);
proto.write(IS_ORGANIZED, isOrganized()); proto.write(IS_ORGANIZED, isOrganized());
proto.write(IS_IGNORING_ORIENTATION_REQUEST, getIgnoreOrientationRequest());
proto.end(token); proto.end(token);
} }