| commit | 3327027b4d578f5709e89c27003b9976e9b1029d | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Tue May 15 09:14:20 2018 -0700 |
| committer | Philip P. Moltmann <moltmann@google.com> | Wed May 16 11:34:29 2018 -0700 |
| tree | f96ee40a9b2c56f710f1d6071ef3c4f40ea5c316 | |
| parent | 338ad60f19c88b32e13c973b1be7c1a6dc003046 [diff] |
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
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 @@ @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());