commit | 25de80c9590f9d10d49d4e5e3b805d11c3d2b1d6 | [log] [tgz] |
---|---|---|
author | android-build-team Robot <android-build-team-robot@google.com> | Thu May 17 07:23:21 2018 +0000 |
committer | android-build-team Robot <android-build-team-robot@google.com> | Thu May 17 07:23:21 2018 +0000 |
tree | f96ee40a9b2c56f710f1d6071ef3c4f40ea5c316 | |
parent | 493548e1d9a92180c58e04610c52ed03d5e05195 [diff] | |
parent | 3327027b4d578f5709e89c27003b9976e9b1029d [diff] |
Snap for 4787078 from 3327027b4d578f5709e89c27003b9976e9b1029d to pi-release Change-Id: I57726e37493b0f1309ff3e8aa8cc0dfee37d89e3
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());