test

Author: vvb2060

library/src/main/java/org/lsposed/hiddenapibypass/Helper.java

@@ -16,60 +16,8 @@
 
 package org.lsposed.hiddenapibypass;
 
-import java.lang.invoke.MethodType;
-
 @SuppressWarnings("unused")
 public class Helper {
-    static public class MethodHandle {
-        private final MethodType type = null;
-        private MethodType nominalType;
-        private MethodHandle cachedSpreadInvoker;
-        protected final int handleKind = 0;
-
-        // The ArtMethod* or ArtField* associated with this method handle (used by the runtime).
-        protected final long artFieldOrMethod = 0;
-    }
-
-    static final public class Class {
-        private transient ClassLoader classLoader;
-        private transient java.lang.Class<?> componentType;
-        private transient Object dexCache;
-        private transient Object extData;
-        private transient Object[] ifTable;
-        private transient String name;
-        private transient java.lang.Class<?> superClass;
-        private transient Object vtable;
-        private transient long iFields;
-        private transient long methods;
-        private transient long sFields;
-        private transient int accessFlags;
-        private transient int classFlags;
-        private transient int classSize;
-        private transient int clinitThreadId;
-        private transient int dexClassDefIndex;
-        private transient volatile int dexTypeIndex;
-        private transient int numReferenceInstanceFields;
-        private transient int numReferenceStaticFields;
-        private transient int objectSize;
-        private transient int objectSizeAllocFastPath;
-        private transient int primitiveType;
-        private transient int referenceInstanceOffsets;
-        private transient int status;
-        private transient short copiedMethodsOffset;
-        private transient short virtualMethodsOffset;
-    }
-
-    static public class AccessibleObject {
-        private boolean override;
-    }
-
-    static final public class Executable extends AccessibleObject {
-        private Class declaringClass;
-        private Class declaringClassOfOverriddenMethod;
-        private Object[] parameters;
-        private long artMethod;
-        private int accessFlags;
-    }
 
     @SuppressWarnings("EmptyMethod")
     public static class NeverCall {

library/src/main/java/org/lsposed/hiddenapibypass/HiddenApiBypass.java

@@ -45,32 +45,6 @@
 import dalvik.system.VMRuntime;
 import sun.misc.Unsafe;
 
-@RequiresApi(Build.VERSION_CODES.P)
-class CoreOjClassLoader extends PathClassLoader {
-    public CoreOjClassLoader() {
-        super(System.getenv("BOOTCLASSPATH"), null);
-    }
-
-    @Override
-    public Class<?> loadClass(String name) throws ClassNotFoundException {
-        if (Object.class.getName().equals(name)) {
-            return Object.class;
-        }
-        try {
-            return findClass(name);
-        } catch (Throwable ignored) {
-        }
-        if (Executable.class.getName().equals(name)) {
-            return Helper.Executable.class;
-        } else if (MethodHandle.class.getName().equals(name)) {
-            return Helper.MethodHandle.class;
-        } else if (Class.class.getName().equals(name)) {
-            return Helper.Class.class;
-        }
-        return super.loadClass(name);
-    }
-}
-
 @RequiresApi(Build.VERSION_CODES.P)
 public final class HiddenApiBypass {
     private static final String TAG = "HiddenApiBypass";
@@ -92,7 +66,7 @@ public final class HiddenApiBypass {
             //noinspection JavaReflectionMemberAccess DiscouragedPrivateApi
             unsafe = (Unsafe) Unsafe.class.getDeclaredMethod("getUnsafe").invoke(null);
             assert unsafe != null;
-            ClassLoader bootClassloader = new CoreOjClassLoader();
+            ClassLoader bootClassloader = new PathClassLoader(System.getenv("BOOTCLASSPATH"), null);
             Class<?> executableClass = bootClassloader.loadClass(Executable.class.getName());
             Class<?> methodHandleClass = bootClassloader.loadClass(MethodHandle.class.getName());
             Class<?> classClass = bootClassloader.loadClass(Class.class.getName());