Merge "Remove more dead SecurityManager cruft." into dalvik-dev

1 files changed, 2 insertions, 7 deletions

diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java
index 13d067c..dc3e063 100644
--- a/dalvik/src/main/java/dalvik/system/DexFile.java
+++ b/dalvik/src/main/java/dalvik/system/DexFile.java
@@ -19,10 +19,8 @@ package dalvik.system;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.security.ProtectionDomain;
 import java.util.Enumeration;
 
-
 /**
  * Manipulates DEX files. The class is similar in principle to
  * {@link java.util.zip.ZipFile}. It is used primarily by class loaders.
@@ -194,13 +192,10 @@ public final class DexFile {
      * @hide
      */
     public Class loadClassBinaryName(String name, ClassLoader loader) {
-        return defineClass(name, loader, mCookie,
-            null);
-            //new ProtectionDomain(name) /*DEBUG ONLY*/);
+        return defineClass(name, loader, mCookie);
     }
 
-    native private static Class defineClass(String name, ClassLoader loader,
-        int cookie, ProtectionDomain pd);
+    private native static Class defineClass(String name, ClassLoader loader, int cookie);
 
     /**
      * Enumerate the names of the classes in this DEX file.