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

Add new field to DisplayRotationProto

Browse Source 
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
This commit is contained in:
armenk
2021-10-12 18:01:39 -07:00
committed by Armen Keshishian
parent e1c734c24f
commit bae0ecb734
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

@@ -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 */

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

@@ -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);
}