summaryrefslogtreecommitdiff
path: root/src/java_lang_Class.cc
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2011-09-22 17:16:54 -0700
committer Brian Carlstrom <bdc@google.com> 2011-09-23 17:11:55 -0700
commitbc2f3e3e41d02eb2896dc16390c5c4023a7b5649 (patch)
tree1f229465f28c2178a7fe849e45bc2fd91d3dab4a /src/java_lang_Class.cc
parent21d9e8323124a832a21679ca83808bc9c68ed365 (diff)
Add support for oat_process for use as a wrap.* launcher
Add test support for running Calculator Change-Id: I7ec0681febe6f6c836452e8afb4c12a2ebfa0ea8
Diffstat (limited to 'src/java_lang_Class.cc')
-rw-r--r--src/java_lang_Class.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/java_lang_Class.cc b/src/java_lang_Class.cc
index ec0b0edf15..c334f046e5 100644
--- a/src/java_lang_Class.cc
+++ b/src/java_lang_Class.cc
@@ -227,13 +227,6 @@ jboolean Class_isPrimitive(JNIEnv* env, jobject javaThis) {
return c->IsPrimitive();
}
-bool CheckClassAccess(const Class* access_from, const Class* klass) {
- if (klass->IsPublic()) {
- return true;
- }
- return access_from->IsInSamePackage(klass);
-}
-
// Validate method/field access.
bool CheckMemberAccess(const Class* access_from, const Class* access_to, uint32_t member_flags) {
// quick accept for public access */
@@ -293,7 +286,7 @@ jobject Class_newInstanceImpl(JNIEnv* env, jobject javaThis) {
Method* caller_caller = frame.GetMethod();
Class* caller_class = caller_caller->GetDeclaringClass();
- if (!CheckClassAccess(c, caller_class)) {
+ if (!caller_class->CanAccess(c)) {
Thread::Current()->ThrowNewException("Ljava/lang/IllegalAccessException;",
"Class %s is not accessible from class %s",
PrettyDescriptor(c->GetDescriptor()).c_str(),