From 3327027b4d578f5709e89c27003b9976e9b1029d Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Tue, 15 May 2018 09:14:20 -0700 Subject: 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 --- .../dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java | 3 +-- 1 file changed, 1 insertion(+), 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()); -- cgit v1.2.3