From fd5836f077c6a61b228ad97b6639392572b4ef0c Mon Sep 17 00:00:00 2001
From: Vali Calinescu <vcalinescu@google.com>
Date: Tue, 28 Mar 2023 14:33:29 +0000
Subject: [PATCH] Add compat fake focus to activity proto for CTS.

Bug: 263984287
Test: atest CtsWindowManagerDeviceTestCases:CompatChangeTests
Change-Id: Ide41f9fe298c89f7a29627b70028c0309f5cd4ba
---
 core/proto/android/server/windowmanagerservice.proto         | 1 +
 services/core/java/com/android/server/wm/ActivityRecord.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto
index d1f7b63b57ea0..e6c8557a8c50e 100644
--- a/core/proto/android/server/windowmanagerservice.proto
+++ b/core/proto/android/server/windowmanagerservice.proto
@@ -390,6 +390,7 @@ message ActivityRecordProto {
     optional bool enable_recents_screenshot = 35;
     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;
 }
 
 /* represents WindowToken */
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 6944b2918d845..81dabfd48bf33 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -179,6 +179,7 @@ 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_SEND_COMPAT_FAKE_FOCUS;
 import static com.android.server.wm.ActivityRecordProto.STARTING_DISPLAYED;
 import static com.android.server.wm.ActivityRecordProto.STARTING_MOVED;
 import static com.android.server.wm.ActivityRecordProto.STARTING_WINDOW;
@@ -10224,6 +10225,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
         proto.write(ENABLE_RECENTS_SCREENSHOT, mEnableRecentsScreenshot);
         proto.write(LAST_DROP_INPUT_MODE, mLastDropInputMode);
         proto.write(OVERRIDE_ORIENTATION, getOverrideOrientation());
+        proto.write(SHOULD_SEND_COMPAT_FAKE_FOCUS, shouldSendCompatFakeFocus());
     }
 
     @Override