Make AddCapabilities call GetPotentialCapabilities.
This will allow us to programatically disable some capabilities in the
future if we so choose.
Test: ./test/testrunner/testrunner.py --host -j40 -b
Change-Id: I82e9ba05b5f3b43e6244adb5a47e054fa7b8ec29
diff --git a/runtime/openjdkjvmti/OpenjdkJvmTi.cc b/runtime/openjdkjvmti/OpenjdkJvmTi.cc
index 77ca9ce..ed44c60 100644
--- a/runtime/openjdkjvmti/OpenjdkJvmTi.cc
+++ b/runtime/openjdkjvmti/OpenjdkJvmTi.cc
@@ -969,10 +969,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; \