Merge "Fix reflection access checks for app compatibility in libcore."

1 files changed, 7 insertions, 0 deletions

diff --git a/libart/src/main/java/java/lang/Class.java b/libart/src/main/java/java/lang/Class.java
index 36a55f5a3..ea41d6e01 100644
--- a/libart/src/main/java/java/lang/Class.java
+++ b/libart/src/main/java/java/lang/Class.java
@@ -1551,6 +1551,10 @@ public final class Class<T> implements Serializable, AnnotatedElement, GenericDe
         if (isPrimitive() || isInterface() || isArray() || Modifier.isAbstract(accessFlags)) {
             throw new InstantiationException(this + " cannot be instantiated");
         }
+        Class<?> caller = VMStack.getStackClass1();
+        if (!caller.canAccess(this)) {
+          throw new IllegalAccessException(this + " is not accessible from " + caller);
+        }
         Constructor<T> init;
         try {
             init = getDeclaredConstructor();
@@ -1560,6 +1564,9 @@ public final class Class<T> implements Serializable, AnnotatedElement, GenericDe
             t.initCause(e);
             throw t;
         }
+        if (!caller.canAccessMember(this, init.getAccessFlags())) {
+          throw new IllegalAccessException(init + " is not accessible from " + caller);
+        }
         try {
             return init.newInstance(null, init.isAccessible());
         } catch (InvocationTargetException e) {