diff --git a/core/src/main/java/de/robv/android/xposed/XposedBridge.java b/core/src/main/java/de/robv/android/xposed/XposedBridge.java index 3b813c8e..d2952508 100644 --- a/core/src/main/java/de/robv/android/xposed/XposedBridge.java +++ b/core/src/main/java/de/robv/android/xposed/XposedBridge.java @@ -115,8 +115,8 @@ public final class XposedBridge { } catch (Resources.NotFoundException nfe) { XposedBridge.log(nfe); } - ResourcesHook.makeInheritable(resClass, resClass.getDeclaredConstructors()); - ResourcesHook.makeInheritable(taClass, taClass.getDeclaredConstructors()); + ResourcesHook.makeInheritable(resClass); + ResourcesHook.makeInheritable(taClass); ClassLoader myCL = XposedBridge.class.getClassLoader(); dummyClassLoader = ResourcesHook.buildDummyClassLoader(myCL.getParent(), resClass.getName(), taClass.getName()); dummyClassLoader.loadClass("xposed.dummy.XResourcesSuperClass"); diff --git a/core/src/main/java/org/lsposed/lspd/nativebridge/ResourcesHook.java b/core/src/main/java/org/lsposed/lspd/nativebridge/ResourcesHook.java index cd1c007c..33f6180d 100644 --- a/core/src/main/java/org/lsposed/lspd/nativebridge/ResourcesHook.java +++ b/core/src/main/java/org/lsposed/lspd/nativebridge/ResourcesHook.java @@ -29,7 +29,7 @@ public class ResourcesHook { public static native boolean initXResourcesNative(); - public static native boolean makeInheritable(Class clazz, Constructor[] constructors); + public static native boolean makeInheritable(Class clazz); public static native ClassLoader buildDummyClassLoader(ClassLoader parent, String resourceSuperClass, String typedArraySuperClass); diff --git a/core/src/main/jni/src/jni/resources_hook.cpp b/core/src/main/jni/src/jni/resources_hook.cpp index 605a4841..f6254d8e 100644 --- a/core/src/main/jni/src/jni/resources_hook.cpp +++ b/core/src/main/jni/src/jni/resources_hook.cpp @@ -98,8 +98,7 @@ namespace lspd { } // @ApiSensitive(Level.MIDDLE) - LSP_DEF_NATIVE_METHOD(jboolean, ResourcesHook, makeInheritable, jclass target_class, - jobjectArray constructors) { + LSP_DEF_NATIVE_METHOD(jboolean, ResourcesHook, makeInheritable, jclass target_class) { if (lsplant::MakeClassInheritable(env, target_class)) { return JNI_TRUE; } @@ -203,8 +202,7 @@ namespace lspd { static JNINativeMethod gMethods[] = { LSP_NATIVE_METHOD(ResourcesHook, initXResourcesNative, "()Z"), - LSP_NATIVE_METHOD(ResourcesHook, makeInheritable, - "(Ljava/lang/Class;[Ljava/lang/reflect/Constructor;)Z"), + LSP_NATIVE_METHOD(ResourcesHook, makeInheritable,"(Ljava/lang/Class;)Z"), LSP_NATIVE_METHOD(ResourcesHook, buildDummyClassLoader, "(Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/ClassLoader;"), LSP_NATIVE_METHOD(ResourcesHook, rewriteXmlReferencesNative, diff --git a/external/lsplant b/external/lsplant index 2bd70518..050561ac 160000 --- a/external/lsplant +++ b/external/lsplant @@ -1 +1 @@ -Subproject commit 2bd70518410ccd6a25adc876a3619d0b23f92e5a +Subproject commit 050561ac9ae5e900c649896a1d3ddc6d2b1188de