From bc2f3e3e41d02eb2896dc16390c5c4023a7b5649 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Thu, 22 Sep 2011 17:16:54 -0700 Subject: Add support for oat_process for use as a wrap.* launcher Add test support for running Calculator Change-Id: I7ec0681febe6f6c836452e8afb4c12a2ebfa0ea8 --- src/java_lang_Class.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/java_lang_Class.cc') 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(), -- cgit v1.2.3-59-g8ed1b