commit c2bcd1cdd9d6b1c60ec9bd9c8ff0abf6a34f2af6
author Jesse Schettler <jschettler@google.com> Fri Oct 12 15:25:36 2018 -0600
committer Jesse Schettler <jschettler@google.com> Mon Oct 22 20:40:57 2018 +0000
tree 1d9b703bd0e1ff6a93d094c962dcd30de0a9affe
parent 8709d30d7a1e2f3d072791c478ba5e73a9b4ec05

Update name of ART FindClass method to GetClass

A change has been made to the name of the ART FindClass method to
distinguish it from the JNI FindClass method. This change updates
calls to the method to use the correct name.

Bug: 112338190
Test: atest CtsJvmtiRedefineClassesHostTestCases \
            CtsJvmtiTaggingHostTestCases \
            CtsJvmtiTrackingHostTestCases

Change-Id: I2d9052c9923b4573705465116a30b10652c4e107
(cherry picked from commit a45c640101f2fd6df54b0993cfe9fe4c44108642)
Merged-In: I2d9052c9923b4573705465116a30b10652c4e107

hostsidetests/jvmti/base/jni/cts_agent.cpp

diff --git a/hostsidetests/jvmti/base/jni/cts_agent.cpp b/hostsidetests/jvmti/base/jni/cts_agent.cpp
index 4499f4b..3f3a836 100644
--- a/hostsidetests/jvmti/base/jni/cts_agent.cpp
+++ b/hostsidetests/jvmti/base/jni/cts_agent.cpp
@@ -44,7 +44,7 @@
   register_android_jvmti_cts_JvmtiTrackingTest(jenv, env);
 
   // Use JNI to load the class.
-  ScopedLocalRef<jclass> klass(env, FindClass(jenv, env, class_name, nullptr));
+  ScopedLocalRef<jclass> klass(env, GetClass(jenv, env, class_name, nullptr));
   CHECK(klass.get() != nullptr) << class_name;
 
   jmethodID method = env->GetStaticMethodID(klass.get(), method_name, "()V");

hostsidetests/jvmti/base/jni/redefine.cpp

diff --git a/hostsidetests/jvmti/base/jni/redefine.cpp b/hostsidetests/jvmti/base/jni/redefine.cpp
index 7656fb3..1a044ca 100644
--- a/hostsidetests/jvmti/base/jni/redefine.cpp
+++ b/hostsidetests/jvmti/base/jni/redefine.cpp
@@ -194,7 +194,7 @@
 };
 
 void register_android_jvmti_cts_JvmtiRedefineClassesTest(jvmtiEnv* jenv, JNIEnv* env) {
-  ScopedLocalRef<jclass> klass(env, FindClass(jenv, env,
+  ScopedLocalRef<jclass> klass(env, GetClass(jenv, env,
           "android/jvmti/cts/JvmtiRedefineClassesTest", nullptr));
   if (klass.get() == nullptr) {
     env->ExceptionClear();

hostsidetests/jvmti/base/jni/tagging.cpp

diff --git a/hostsidetests/jvmti/base/jni/tagging.cpp b/hostsidetests/jvmti/base/jni/tagging.cpp
index 8ab4a10..35d83d7 100644
--- a/hostsidetests/jvmti/base/jni/tagging.cpp
+++ b/hostsidetests/jvmti/base/jni/tagging.cpp
@@ -137,7 +137,7 @@
 };
 
 void register_art_Main(jvmtiEnv* jenv, JNIEnv* env) {
-  ScopedLocalRef<jclass> klass(env, FindClass(jenv, env, "art/Main", nullptr));
+  ScopedLocalRef<jclass> klass(env, GetClass(jenv, env, "art/Main", nullptr));
   if (klass.get() == nullptr) {
     env->ExceptionClear();
     return;
@@ -157,7 +157,7 @@
 };
 
 void register_android_jvmti_cts_JvmtiTaggingTest(jvmtiEnv* jenv, JNIEnv* env) {
-  ScopedLocalRef<jclass> klass(env, FindClass(jenv, env,
+  ScopedLocalRef<jclass> klass(env, GetClass(jenv, env,
           "android/jvmti/cts/JvmtiTaggingTest", nullptr));
   if (klass.get() == nullptr) {
     env->ExceptionClear();

hostsidetests/jvmti/base/jni/tracking.cpp

diff --git a/hostsidetests/jvmti/base/jni/tracking.cpp b/hostsidetests/jvmti/base/jni/tracking.cpp
index 5ee6d57..425fd63 100644
--- a/hostsidetests/jvmti/base/jni/tracking.cpp
+++ b/hostsidetests/jvmti/base/jni/tracking.cpp
@@ -106,7 +106,7 @@
 };
 
 void register_android_jvmti_cts_JvmtiTrackingTest(jvmtiEnv* jenv, JNIEnv* env) {
-  ScopedLocalRef<jclass> klass(env, FindClass(jenv, env,
+  ScopedLocalRef<jclass> klass(env, GetClass(jenv, env,
           "android/jvmti/cts/JvmtiTrackingTest", nullptr));
   if (klass.get() == nullptr) {
     env->ExceptionClear();