commit 493548e1d9a92180c58e04610c52ed03d5e05195
author android-build-team Robot <android-build-team-robot@google.com> Sun May 06 07:25:55 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun May 06 07:25:55 2018 +0000
tree 057c04fc0d2b9d18333cd3c849a8fbbd3d2722cc
parent 34b267e5fe03898705b615046f37f30f979b9930
parent 338ad60f19c88b32e13c973b1be7c1a6dc003046

Snap for 4765094 from 338ad60f19c88b32e13c973b1be7c1a6dc003046 to pi-release

Change-Id: Ifa3da79f7409642bcfaed9fbcab5fa428eb117f6

dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/JvmtiAgent.java

diff --git a/dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/JvmtiAgent.java b/dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/JvmtiAgent.java
index 5cd79d1..34c5c48 100644
--- a/dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/JvmtiAgent.java
+++ b/dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/JvmtiAgent.java
@@ -51,9 +51,8 @@
      * @throws IOException If jvmti could not be enabled or agent could not be loaded
      */
     JvmtiAgent() throws IOException {
-        // TODO (moltmann@google.com): Replace with proper check for >= P
-        if (!Build.VERSION.CODENAME.equals("P")) {
-            throw new IOException("Requires Android P. Build is " + Build.VERSION.CODENAME);
+        if (Build.VERSION.SDK_INT < 28) {
+            throw new IOException("Requires API 28. API is " + Build.VERSION.SDK_INT);
         }
 
         ClassLoader cl = JvmtiAgent.class.getClassLoader();