commit 708ada45aca27adaef1a20bf06b9c769a372ed5b
author Kai Li <klikli@google.com> Wed Apr 09 08:08:32 2025 -0700
committer Kai Li <klikli@google.com> Wed Apr 09 08:10:57 2025 -0700
tree faaf8c47ce7d13f4776d3abf934f4f49b5181da0
parent be6bfb6713c93b5abaf514798d5f606f43ea1337

Added activityId to underlay system ui requests.

This will help system UI to match the request and activity.

Bug: 403422950
Flag: android.view.contentcapture.flags.enable_system_ui_underlay
Change-Id: I6139852d78465ca1930a3e8795ab6db3e614763d
Test: atest CtsContentCaptureServiceTestCase

services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java

diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
index 8c30125..73fc613 100644
--- a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
+++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
@@ -360,8 +360,9 @@
         // Make sure service is bound, just in case the initial connection failed somehow
         mRemoteService.ensureBoundLocked();
 
+        final ActivityId activityId = new ActivityId(taskId, shareableActivityToken);
         final ContentCaptureServerSession newSession = new ContentCaptureServerSession(mLock,
-                activityToken, new ActivityId(taskId, shareableActivityToken), this, componentName,
+                activityToken, activityId, this, componentName,
                 clientReceiver, taskId, displayId, sessionId, uid, flags);
         if (mMaster.verbose) {
             Slog.v(TAG, "startSession(): new session for "
@@ -372,7 +373,7 @@
 
         if (Flags.enableSystemUiUnderlay()) {
             if (mMaster.debug) Slog.d(mTag, "startSessionLocked " + componentName);
-            createSystemUIUnderlay(newSession.getSessionId());
+            createSystemUIUnderlay(newSession.getSessionId(), activityId);
         }
     }
 
@@ -588,12 +589,12 @@
             if (type == ActivityEvent.TYPE_ACTIVITY_STARTED) {
                 ContentCaptureServerSession session = getSession(activityId);
                 if (session != null) {
-                    createSystemUIUnderlay(session.getSessionId());
+                    createSystemUIUnderlay(session.getSessionId(), activityId);
                 }
             } else if (type == ActivityEvent.TYPE_ACTIVITY_STOPPED) {
                 ContentCaptureServerSession session = getSession(activityId);
                 if (session != null) {
-                    destroySystemUIUnderlay(session.getSessionId());
+                    destroySystemUIUnderlay(session.getSessionId(), activityId);
                 }
             }
         }
@@ -601,21 +602,23 @@
         mRemoteService.onActivityLifecycleEvent(event);
     }
 
-    private void createSystemUIUnderlay(int sessionId) {
+    private void createSystemUIUnderlay(int sessionId, ActivityId activityId) {
         if (mMaster.debug) Slog.d(mTag, "createSystemUIUnderlay: " + sessionId);
         // TODO: b/403422950 migrate to aidl when available
         Intent intent = new Intent(ACTION_CREATE_UNDERLAY);
         intent.putExtra("dataSessionId", sessionId);
         intent.putExtra("timestamp", System.currentTimeMillis());
+        intent.putExtra("activityId", activityId);
         getContext().sendBroadcast(intent);
     }
 
-    private void destroySystemUIUnderlay(int sessionId) {
+    private void destroySystemUIUnderlay(int sessionId, ActivityId activityId) {
         if (mMaster.debug) Slog.d(mTag, "destroySystemUIUnderlay: " + sessionId);
         // TODO: b/403422950 migrate to aidl when available
         Intent intent = new Intent(ACTION_DESTROY_UNDERLAY);
         intent.putExtra("dataSessionId", sessionId);
         intent.putExtra("timestamp", System.currentTimeMillis());
+        intent.putExtra("activityId", activityId);
         getContext().sendBroadcast(intent);
     }