Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: 23e304a839 am: 91c5e5ff9d am: 138b64feb6

Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic05d8452bb92220507ec751aa85c8e657f77cc79

1 files changed, 1 insertions, 20 deletions

diff --git a/src/main/java/org/junit/runners/model/FrameworkField.java b/src/main/java/org/junit/runners/model/FrameworkField.java
index ea2b16f..945e389 100644
--- a/src/main/java/org/junit/runners/model/FrameworkField.java
+++ b/src/main/java/org/junit/runners/model/FrameworkField.java
@@ -14,26 +14,12 @@ import org.junit.runners.BlockJUnit4ClassRunner;
 public class FrameworkField extends FrameworkMember<FrameworkField> {
     private final Field field;
 
-    /**
-     * Returns a new {@code FrameworkField} for {@code field}.
-     *
-     * <p>Access relaxed to {@code public} since version 4.13.1.
-     */
-    public FrameworkField(Field field) {
+    FrameworkField(Field field) {
         if (field == null) {
             throw new NullPointerException(
                     "FrameworkField cannot be created without an underlying field.");
         }
         this.field = field;
-
-        if (isPublic()) {
-            // This field could be a public field in a package-scope base class
-            try {
-                field.setAccessible(true);
-            } catch (SecurityException e) {
-                // We may get an IllegalAccessException when we try to access the field
-            }
-        }
     }
 
     @Override
@@ -55,11 +41,6 @@ public class FrameworkField extends FrameworkMember<FrameworkField> {
     }
 
     @Override
-    boolean isBridgeMethod() {
-        return false;
-    }
-
-    @Override
     protected int getModifiers() {
         return field.getModifiers();
     }