aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2018-05-15 09:14:20 -0700
committerPhilip P. Moltmann <moltmann@google.com>2018-05-16 11:34:29 -0700
commit3327027b4d578f5709e89c27003b9976e9b1029d (patch)
treef96ee40a9b2c56f710f1d6071ef3c4f40ea5c316
parent338ad60f19c88b32e13c973b1be7c1a6dc003046 (diff)
downloaddexmaker-3327027b4d578f5709e89c27003b9976e9b1029d.tar.gz
MultipleJvmtiAgentsInterference emergency fix for API 28
All this will be replaced once API 28 is available upstream. Test: atest CtsInlineMockingTestCases Change-Id: I7cbefe995d36aeafc647458dc4041c7754e2dcd2 Fixes: 79707578
-rw-r--r--dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java b/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java
index bdc0626..4f84276 100644
--- a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java
+++ b/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java
@@ -38,8 +38,7 @@ public class MultipleJvmtiAgentsInterference {
@BeforeClass
public static void installTestAgent() throws Exception {
- // TODO (moltmann@google.com): Replace with proper check for >= P
- assumeTrue(Build.VERSION.CODENAME.equals("P"));
+ assumeTrue(Build.VERSION.SDK_INT >= 28);
Debug.attachJvmtiAgent(AGENT_LIB_NAME, null,
MultipleJvmtiAgentsInterference.class.getClassLoader());