From 3c726ef47af8e9ffc7621bc5e9fbfe13af18fc3c Mon Sep 17 00:00:00 2001 From: Phil Weaver Date: Tue, 7 Mar 2017 12:12:05 -0800 Subject: [PATCH] Adjust use of hidden API which I'm changing. The runner is using internal constants from accessibility. I'm moving window IDs to AccessibilityWindowInfo, so this project needs to change as well. Bug: 34773134 Test: Just verifying the build. Change-Id: I64fa4ff63543deadb7aa32b3e93d3dad1d6b9439 --- .../android/commands/monkey/MonkeySourceNetworkViews.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkViews.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkViews.java index 44dffabe8..986b790fb 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkViews.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkViews.java @@ -29,6 +29,7 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.view.accessibility.AccessibilityInteractionClient; import android.view.accessibility.AccessibilityNodeInfo; +import android.view.accessibility.AccessibilityWindowInfo; import com.android.commands.monkey.MonkeySourceNetwork.CommandQueue; import com.android.commands.monkey.MonkeySourceNetwork.MonkeyCommand; @@ -147,7 +148,7 @@ public class MonkeySourceNetworkViews { int connectionId = sUiTestAutomationBridge.getConnectionId(); AccessibilityInteractionClient client = AccessibilityInteractionClient.getInstance(); List infos = client.findAccessibilityNodeInfosByViewId( - connectionId, AccessibilityNodeInfo.ACTIVE_WINDOW_ID, + connectionId, AccessibilityWindowInfo.ACTIVE_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, viewId); return (!infos.isEmpty()) ? infos.get(0) : null; } @@ -261,7 +262,7 @@ public class MonkeySourceNetworkViews { int connectionId = sUiTestAutomationBridge.getConnectionId(); List nodes = AccessibilityInteractionClient.getInstance() .findAccessibilityNodeInfosByText(connectionId, - AccessibilityNodeInfo.ACTIVE_WINDOW_ID, + AccessibilityWindowInfo.ACTIVE_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, text); ViewIntrospectionCommand idGetter = new GetAccessibilityIds(); List emptyArgs = new ArrayList();