diff options
| author | 2018-04-03 14:13:13 +0000 | |
|---|---|---|
| committer | 2018-04-06 10:08:21 -0700 | |
| commit | 8c5de0f16444441c23a5ae807e4dd5cc0dd586a3 (patch) | |
| tree | a0753accc18ccc000280e18327c57f7352e2ace5 /runtime/native/java_lang_Class.cc | |
| parent | a9660f1dc13b4d595b3f89b06dd5b70eeee18c43 (diff) | |
Revert "hidden_api: Call back into libcore on hidden api detection"
This reverts commit 757a9d0a2e97d43bafeb8a95cc3c51102be99586.
Reason for revert: Test failures with "art/test.py --host -t test-art-host-run-test-debug-prebuild-interpreter-no-relocate-ntrace-gcstress-checkjni-picimage-pictest-ndebuggable-no-jvmti-cdex-fast-674-hiddenapi64"
Bug: 73896556
Test: art/test.py --host -t test-art-host-run-test-debug-prebuild-interpreter-no-relocate-ntrace-gcstress-checkjni-picimage-pictest-ndebuggable-no-jvmti-cdex-fast-674-hiddenapi64
(cherry picked from commit 9e68ade384abdb15714054feaed06cb38eb5432f)
Merged-In: Ib2ad89c16ad797c37f6212bc7e5c0b6b92ce56b5
Change-Id: I11fa9b76da07162fde8773eb05cfc6a6514e0ca1
Diffstat (limited to 'runtime/native/java_lang_Class.cc')
| -rw-r--r-- | runtime/native/java_lang_Class.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index 1c17806b5e..ad05856eaf 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -535,19 +535,18 @@ static jobjectArray Class_getDeclaredConstructorsInternal( static jobject Class_getDeclaredMethodInternal(JNIEnv* env, jobject javaThis, jstring name, jobjectArray args) { ScopedFastNativeObjectAccess soa(env); - StackHandleScope<1> hs(soa.Self()); DCHECK_EQ(Runtime::Current()->GetClassLinker()->GetImagePointerSize(), kRuntimePointerSize); DCHECK(!Runtime::Current()->IsActiveTransaction()); - Handle<mirror::Method> result = hs.NewHandle( + ObjPtr<mirror::Method> result = mirror::Class::GetDeclaredMethodInternal<kRuntimePointerSize, false>( soa.Self(), DecodeClass(soa, javaThis), soa.Decode<mirror::String>(name), - soa.Decode<mirror::ObjectArray<mirror::Class>>(args))); + soa.Decode<mirror::ObjectArray<mirror::Class>>(args)); if (result == nullptr || ShouldBlockAccessToMember(result->GetArtMethod(), soa.Self())) { return nullptr; } - return soa.AddLocalReference<jobject>(result.Get()); + return soa.AddLocalReference<jobject>(result); } static jobjectArray Class_getDeclaredMethodsUnchecked(JNIEnv* env, jobject javaThis, |