From 3e5df2004359fd39bafbac2d16dd509f02b2212f Mon Sep 17 00:00:00 2001
From: Sally <sallyyuen@google.com>
Date: Tue, 20 Apr 2021 20:50:23 +0000
Subject: [PATCH] Add prefetch result to a11y tracing

Test: callback appears in trace
Bug: 157601519
Change-Id: I65c8dd1fa5c33c84c873ffa7b6d772395d0adbdb
---
 .../AccessibilityInteractionClient.java        | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java
index df67740565ea9..272dfacba8c42 100644
--- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java
+++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java
@@ -972,6 +972,14 @@ public final class AccessibilityInteractionClient
             finalizeAndCacheAccessibilityNodeInfos(
                     infos, connectionIdWaitingForPrefetchResultCopy, false,
                     packageNamesForNextPrefetchResultCopy);
+            if (mAccessibilityManager != null
+                    && mAccessibilityManager.isAccessibilityTracingEnabled()) {
+                logTrace(getConnection(connectionIdWaitingForPrefetchResultCopy),
+                        "setPrefetchAccessibilityNodeInfoResult",
+                        "InteractionId:" + interactionId + ";Result: " + infos
+                                + ";connectionId=" + connectionIdWaitingForPrefetchResultCopy,
+                        Binder.getCallingUid());
+            }
         } else if (DEBUG) {
             Log.w(LOG_TAG, "Prefetching for interaction with id " + interactionId + " dropped "
                     + infos.size() + " nodes");
@@ -1212,7 +1220,8 @@ public final class AccessibilityInteractionClient
     }
 
     private void logTrace(
-            IAccessibilityServiceConnection connection, String method, String params) {
+            IAccessibilityServiceConnection connection, String method, String params,
+            int callingUid) {
         try {
             Bundle b = new Bundle();
             ArrayList<StackTraceElement> callStack = new ArrayList<StackTraceElement>(
@@ -1220,9 +1229,14 @@ public final class AccessibilityInteractionClient
             b.putSerializable(CALL_STACK, callStack);
             connection.logTrace(SystemClock.elapsedRealtimeNanos(),
                     LOG_TAG + ".callback for " + method, params, Process.myPid(),
-                    Thread.currentThread().getId(), mCallingUid, b);
+                    Thread.currentThread().getId(), callingUid, b);
         } catch (RemoteException e) {
             Log.e(LOG_TAG, "Failed to log trace. " + e);
         }
     }
+
+    private void logTrace(
+            IAccessibilityServiceConnection connection, String method, String params) {
+        logTrace(connection, method, params, mCallingUid);
+    }
 }