commit 12664625ccbf7b11b7b8f8daca5ac1cb405ef7a3
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 27 20:32:34 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 27 20:32:35 2017 +0000
tree 76a1aba522a0dea892664c406955341e72c09e49
parent 64be7c55311988bf52f6833635f79bdd8329dfec
parent 1d22496040cba6f6e620d7ee1fecd3d0e5b63c07

Merge "Make AddCapabilities call GetPotentialCapabilities."

runtime/openjdkjvmti/OpenjdkJvmTi.cc

diff --git a/runtime/openjdkjvmti/OpenjdkJvmTi.cc b/runtime/openjdkjvmti/OpenjdkJvmTi.cc
index 450b6b6..5e6b18a 100644
--- a/runtime/openjdkjvmti/OpenjdkJvmTi.cc
+++ b/runtime/openjdkjvmti/OpenjdkJvmTi.cc
@@ -970,10 +970,15 @@
     ArtJvmTiEnv* art_env = static_cast<ArtJvmTiEnv*>(env);
     jvmtiError ret = OK;
     jvmtiCapabilities changed;
+    jvmtiCapabilities potential_capabilities;
+    ret = env->GetPotentialCapabilities(&potential_capabilities);
+    if (ret != OK) {
+      return ret;
+    }
 #define ADD_CAPABILITY(e) \
     do { \
       if (capabilities_ptr->e == 1) { \
-        if (kPotentialCapabilities.e == 1) { \
+        if (potential_capabilities.e == 1) { \
           if (art_env->capabilities.e != 1) { \
             art_env->capabilities.e = 1; \
             changed.e = 1; \