commit edb595d5ee6d5b2eddf9b897efc4ccbf56ee6c12
author Jesse Wilson <jessewilson@google.com> Mon Mar 28 16:05:04 2011 -0700
committer Jesse Wilson <jessewilson@google.com> Mon Mar 28 16:11:26 2011 -0700
tree c69d27b3963d1f7e6b2e9f8cf888cebd184c466d
parent a0967284eb501f8b19c3c6d331ae7bb7b2a82fba

Remove unused security manager code.

Change-Id: Iecc602b8235eb3feeac31e198bdaf61c65dd9fbf
http://b/4087759

vm/Globals.h

diff --git a/vm/Globals.h b/vm/Globals.h
index 9e37aac..18acd88 100644
--- a/vm/Globals.h
+++ b/vm/Globals.h
@@ -352,7 +352,6 @@
     Method*     methJavaLangClassLoader_getSystemClassLoader;
 
     /* field offsets - java.lang.reflect.* */
-    int         offJavaLangReflectAccessibleObject_flag;
     int         offJavaLangReflectConstructor_slot;
     int         offJavaLangReflectConstructor_declClass;
     int         offJavaLangReflectField_slot;

vm/InitRefs.c

diff --git a/vm/InitRefs.c b/vm/InitRefs.c
index f7fc4da..2ac8bb8 100644
--- a/vm/InitRefs.c
+++ b/vm/InitRefs.c
@@ -314,11 +314,6 @@
         { NULL, NULL, NULL }
     };
 
-    static struct FieldInfo infoAccessibleObject[] = {
-        { &gDvm.offJavaLangReflectAccessibleObject_flag, "flag", "Z" },
-        { NULL, NULL, NULL }
-    };
-
     static struct FieldInfo infoConstructor[] = {
         { &gDvm.offJavaLangReflectConstructor_slot,      "slot",           "I" },
         { &gDvm.offJavaLangReflectConstructor_declClass, "declaringClass", "Ljava/lang/Class;" },
@@ -356,7 +351,6 @@
         { "Ljava/lang/ThreadGroup;",                infoThreadGroup },
         { "Ljava/lang/Throwable;",                  infoThrowable },
         { "Ljava/lang/VMThread;",                   infoVMThread },
-        { "Ljava/lang/reflect/AccessibleObject;",   infoAccessibleObject },
         { "Ljava/lang/reflect/Constructor;",        infoConstructor },
         { "Ljava/lang/reflect/Field;",              infoField },
         { "Ljava/lang/reflect/Method;",             infoMethod },

vm/native/java_lang_Class.c

diff --git a/vm/native/java_lang_Class.c b/vm/native/java_lang_Class.c
index 65fbbb7..a3839a3 100644
--- a/vm/native/java_lang_Class.c
+++ b/vm/native/java_lang_Class.c
@@ -757,19 +757,6 @@
     }
 }
 
-/*
- * static native void setAccessibleNoCheck(AccessibleObject ao, boolean flag);
- */
-static void Dalvik_java_lang_Class_setAccessibleNoCheck(const u4* args,
-    JValue* pResult)
-{
-    Object* target = (Object*) args[0];
-    u4 flag = (u4) args[1];
-
-    dvmSetFieldBoolean(target, gDvm.offJavaLangReflectAccessibleObject_flag,
-            flag);
-}
-
 const DalvikNativeMethod dvm_java_lang_Class[] = {
     { "desiredAssertionStatus", "()Z",
         Dalvik_java_lang_Class_desiredAssertionStatus },
@@ -837,7 +824,5 @@
         Dalvik_java_lang_Class_isDeclaredAnnotationPresent },
     { "getInnerClassName",       "()Ljava/lang/String;",
         Dalvik_java_lang_Class_getInnerClassName },
-    { "setAccessibleNoCheck",   "(Ljava/lang/reflect/AccessibleObject;Z)V",
-        Dalvik_java_lang_Class_setAccessibleNoCheck },
     { NULL, NULL, NULL },
 };