From bae0ecb734432212bd70396d9fef4bac1f746817 Mon Sep 17 00:00:00 2001 From: armenk Date: Tue, 12 Oct 2021 18:01:39 -0700 Subject: [PATCH] Add new field to DisplayRotationProto Some WM CTS tests must be skipped if isFixedToUserRotation is set to true. We need to add a new field in DisplayRotationProto and pass the result of isFixedToUserRotation() function call. Bug: 195448358 Test: atest AppConfigurationTests Change-Id: I9d867f898473ebc9c3b346ef6a6cfde78121a3f5 --- core/proto/android/server/windowmanagerservice.proto | 1 + services/core/java/com/android/server/wm/DisplayRotation.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index 3248cf513c84c..8ef38254a38b5 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -262,6 +262,7 @@ message DisplayRotationProto { optional int32 user_rotation = 3 [(.android.typedef) = "android.view.Surface.Rotation"]; optional int32 fixed_to_user_rotation_mode = 4; optional int32 last_orientation = 5 [(.android.typedef) = "android.content.pm.ActivityInfo.ScreenOrientation"]; + optional bool is_fixed_to_user_rotation = 6; } /* represents DockedTaskDividerController */ diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java index b6552cb1b962f..427bbeb78fb03 100644 --- a/services/core/java/com/android/server/wm/DisplayRotation.java +++ b/services/core/java/com/android/server/wm/DisplayRotation.java @@ -27,6 +27,7 @@ import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ORIENTATION; import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_OPEN; import static com.android.server.wm.DisplayRotationProto.FIXED_TO_USER_ROTATION_MODE; import static com.android.server.wm.DisplayRotationProto.FROZEN_TO_USER_ROTATION; +import static com.android.server.wm.DisplayRotationProto.IS_FIXED_TO_USER_ROTATION; import static com.android.server.wm.DisplayRotationProto.LAST_ORIENTATION; import static com.android.server.wm.DisplayRotationProto.ROTATION; import static com.android.server.wm.DisplayRotationProto.USER_ROTATION; @@ -1527,6 +1528,7 @@ public class DisplayRotation { proto.write(USER_ROTATION, getUserRotation()); proto.write(FIXED_TO_USER_ROTATION_MODE, mFixedToUserRotation); proto.write(LAST_ORIENTATION, mLastOrientation); + proto.write(IS_FIXED_TO_USER_ROTATION, isFixedToUserRotation()); proto.end(token); }