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

Merge "Add new field to DisplayRotationProto"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-11 06:38:47 +00:00
committed by Android (Google) Code Review
parent 44b9f407e7 bae0ecb734
commit c44fa145d1
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);
}