summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Hao <jeffhao@google.com> 2014-04-01 18:04:42 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-04-01 18:04:42 +0000
commit14f8807ae14798e48cfe3d5ae6156a613a720dc0 (patch)
tree865e76899b04120300775ed5513be2ab58f42ecb
parent1ad45ef91afc64174004485f88efd4b7cea516fc (diff)
parentdd9699a536e5d0c1a10b4bdb37b88312930793e8 (diff)
Merge "Revert "Fix access checks for app compatibility.""
-rw-r--r--runtime/reflection.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/reflection.cc b/runtime/reflection.cc
index a83f5216e3..6ed61f6351 100644
--- a/runtime/reflection.cc
+++ b/runtime/reflection.cc
@@ -799,7 +799,8 @@ bool VerifyAccess(mirror::Object* obj, mirror::Class* declaring_class, uint32_t
visitor.WalkStack();
mirror::Class* caller_class = visitor.caller->GetDeclaringClass();
- if (((access_flags & kAccPublic) != 0) || caller_class == declaring_class) {
+ if ((((access_flags & kAccPublic) != 0) && declaring_class->IsPublic()) ||
+ caller_class == declaring_class) {
return true;
}
if ((access_flags & kAccPrivate) != 0) {