commit e3738c280e54c79f81243eb8c5f908167ace9964
author Andreas Gampe <agampe@google.com> Thu Apr 06 22:01:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 06 22:01:27 2017 +0000
tree c78bd806f44a627a3acde7c1c197178205058d9f
parent 1a05937e6ced7d2c13ad9809a0b56105d10f136c
parent 3ccd80611c1efd942bc7149c425b321fe8ac0020

Merge "CTS: Use cmd activity instead of am" am: 45eb89bd05 am: c8f5df263d
am: 3ccd80611c

Change-Id: I9dbd55b1a3bc4956fc204484a017706cc98601c3

hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java

diff --git a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java
index 326ff96..aba1d02 100644
--- a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java
+++ b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java
@@ -109,8 +109,8 @@
 
                 String agentInDataData = installLibToDataData(pwd, "libctsjvmtiagent.so");
 
-                String attachReply = mDevice
-                        .executeShellCommand("am attach-agent " + mPkg + " " + agentInDataData);
+                String attachCmd = "cmd activity attach-agent " + mPkg + " " + agentInDataData;
+                String attachReply = mDevice.executeShellCommand(attachCmd);
                 // Don't try to parse the output. The test will time out anyways if this didn't
                 // work.
                 if (attachReply != null && !attachReply.trim().isEmpty()) {