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

Add camera compat state to activity proto for CTS.

Browse Source 
Fix: 270951602
Test: atest CtsWindowManagerDeviceTestCases:CompatChangeTests
Change-Id: I5d787f48dc4429bd16c169d429cbaff6cd929ec6
This commit is contained in:
Mariia Sandrikova
2023-03-30 00:25:21 +01:00
parent 29076b94b8
commit 34fd5caeaa
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,6 +391,9 @@ message ActivityRecordProto {
optional int32 last_drop_input_mode = 36;
optional int32 override_orientation = 37 [(.android.typedef) = "android.content.pm.ActivityInfo.ScreenOrientation"];
optional bool should_send_compat_fake_focus = 38;
optional bool should_force_rotate_for_camera_compat = 39;
optional bool should_refresh_activity_for_camera_compat = 40;
optional bool should_refresh_activity_via_pause_for_camera_compat = 41;
}
/* represents WindowToken */

9
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -179,6 +179,9 @@ import static com.android.server.wm.ActivityRecordProto.PROC_ID;
import static com.android.server.wm.ActivityRecordProto.PROVIDES_MAX_BOUNDS;
import static com.android.server.wm.ActivityRecordProto.REPORTED_DRAWN;
import static com.android.server.wm.ActivityRecordProto.REPORTED_VISIBLE;
import static com.android.server.wm.ActivityRecordProto.SHOULD_FORCE_ROTATE_FOR_CAMERA_COMPAT;
import static com.android.server.wm.ActivityRecordProto.SHOULD_REFRESH_ACTIVITY_FOR_CAMERA_COMPAT;
import static com.android.server.wm.ActivityRecordProto.SHOULD_REFRESH_ACTIVITY_VIA_PAUSE_FOR_CAMERA_COMPAT;
import static com.android.server.wm.ActivityRecordProto.SHOULD_SEND_COMPAT_FAKE_FOCUS;
import static com.android.server.wm.ActivityRecordProto.STARTING_DISPLAYED;
import static com.android.server.wm.ActivityRecordProto.STARTING_MOVED;
@@ -10226,6 +10229,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
proto.write(LAST_DROP_INPUT_MODE, mLastDropInputMode);
proto.write(OVERRIDE_ORIENTATION, getOverrideOrientation());
proto.write(SHOULD_SEND_COMPAT_FAKE_FOCUS, shouldSendCompatFakeFocus());
proto.write(SHOULD_FORCE_ROTATE_FOR_CAMERA_COMPAT,
mLetterboxUiController.shouldForceRotateForCameraCompat());
proto.write(SHOULD_REFRESH_ACTIVITY_FOR_CAMERA_COMPAT,
mLetterboxUiController.shouldRefreshActivityForCameraCompat());
proto.write(SHOULD_REFRESH_ACTIVITY_VIA_PAUSE_FOR_CAMERA_COMPAT,
mLetterboxUiController.shouldRefreshActivityViaPauseForCameraCompat());
}
@Override