diff options
| author | 2018-04-06 20:11:28 +0000 | |
|---|---|---|
| committer | 2018-04-06 20:11:28 +0000 | |
| commit | faa7b29f1e0c311e42ab5a265cb1b17036ca5a10 (patch) | |
| tree | 2d47cb8b1c10df002a602009724a026b136b3c9d /runtime/interpreter/unstarted_runtime.cc | |
| parent | d7d9f00b9e87e491f2fc0631ed64ad1acde9c744 (diff) | |
| parent | f5f1f80aa6c1c10c61b6723bbc52d5aec2eba2b9 (diff) | |
Merge changes from topic "hidden_api_cp"
* changes:
Revert^2 "hidden_api: Call back into libcore on hidden api detection""
Revert "hidden_api: Call back into libcore on hidden api detection"
hidden_api: Call back into libcore on hidden api detection
Diffstat (limited to 'runtime/interpreter/unstarted_runtime.cc')
| -rw-r--r-- | runtime/interpreter/unstarted_runtime.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc index 4c7a97dfa8..dd8d7dd3e2 100644 --- a/runtime/interpreter/unstarted_runtime.cc +++ b/runtime/interpreter/unstarted_runtime.cc @@ -181,11 +181,13 @@ static mirror::String* GetClassName(Thread* self, ShadowFrame* shadow_frame, siz template<typename T> static ALWAYS_INLINE bool ShouldBlockAccessToMember(T* member, ShadowFrame* frame) REQUIRES_SHARED(Locks::mutator_lock_) { - return hiddenapi::ShouldBlockAccessToMember( + // All uses in this file are from reflection + constexpr hiddenapi::AccessMethod access_method = hiddenapi::kReflection; + return hiddenapi::GetMemberAction( member, frame->GetMethod()->GetDeclaringClass()->GetClassLoader(), frame->GetMethod()->GetDeclaringClass()->GetDexCache(), - hiddenapi::kReflection); // all uses in this file are from reflection + access_method) == hiddenapi::kDeny; } void UnstartedRuntime::UnstartedClassForNameCommon(Thread* self, |