update: XPosed API; update: sepolicy.rule (#5)

This commit both updates the "sepolicy.rule" to be in sync with official LSPosed and updates XPosed API.

Author: fatalcoder524

.github/workflows/core.yml

@@ -45,7 +45,6 @@ jobs:
         with:
           repository: libxposed/api
           path: libxposed/api
-          ref: 54582730315ba4a3d7cfaf9baf9d23c419e07006
 
       - name: Checkout libxposed/service
         uses: actions/checkout@v4

core/proguard-rules.pro

@@ -1,6 +1,7 @@
 -keep class android.** { *; }
 -keep class de.robv.android.xposed.** {*;}
 -keep class io.github.libxposed.** {*;}
+-keep class org.lsposed.lspd.annotation.* {*;}
 -keep class org.lsposed.lspd.core.* {*;}
 -keep class org.lsposed.lspd.hooker.HandleSystemServerProcessHooker {*;}
 -keep class org.lsposed.lspd.hooker.HandleSystemServerProcessHooker$Callback {*;}
@@ -22,9 +23,13 @@
 -keepclassmembers class org.lsposed.lspd.impl.LSPosedHookCallback {
     public <methods>;
 }
+-keepclassmembers,allowoptimization class ** implements io.github.libxposed.api.XposedInterface$Hooker {
+    public *** before(***);
+    public *** after(***);
+}
 -keep,allowoptimization,allowobfuscation @io.github.libxposed.api.annotations.* class * {
-    @io.github.libxposed.api.annotations.BeforeInvocation <methods>;
-    @io.github.libxposed.api.annotations.AfterInvocation <methods>;
+    public *** before(***);
+    public *** after(***);
 }
 -assumenosideeffects class android.util.Log {
     public static *** v(...);

core/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java

@@ -21,15 +21,10 @@
 package de.robv.android.xposed.callbacks;
 
 import android.content.res.XResources;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import de.robv.android.xposed.IXposedHookInitPackageResources;
-import io.github.libxposed.api.XposedModuleInterface;
 
 /**
  * This class is only used for internal purposes, except for the {@link InitPackageResourcesParam}

core/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java

@@ -21,16 +21,10 @@
 package de.robv.android.xposed.callbacks;
 
 import android.content.pm.ApplicationInfo;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import de.robv.android.xposed.IXposedHookLoadPackage;
-import de.robv.android.xposed.XposedBridge.CopyOnWriteSortedSet;
-import io.github.libxposed.api.XposedModuleInterface;
 
 /**
  * This class is only used for internal purposes, except for the {@link LoadPackageParam}

core/src/main/java/io/github/libxposed/api/annotations/AfterInvocation.java

@@ -0,0 +1,11 @@
+package io.github.libxposed.api.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface AfterInvocation {
+}

core/src/main/java/io/github/libxposed/api/annotations/BeforeInvocation.java

@@ -0,0 +1,11 @@
+package io.github.libxposed.api.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface BeforeInvocation {
+}

core/src/main/java/io/github/libxposed/api/annotations/XposedHooker.java

@@ -0,0 +1,11 @@
+package io.github.libxposed.api.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.TYPE_USE})
+public @interface XposedHooker {
+}

core/src/main/java/org/lsposed/lspd/core/ApplicationServiceClient.java

@@ -19,7 +19,6 @@
 
 package org.lsposed.lspd.core;
 
-import android.os.Bundle;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;

core/src/main/java/org/lsposed/lspd/core/Startup.java

@@ -31,8 +31,8 @@
 import org.lsposed.lspd.hooker.AttachHooker;
 import org.lsposed.lspd.hooker.CrashDumpHooker;
 import org.lsposed.lspd.hooker.HandleSystemServerProcessHooker;
-import org.lsposed.lspd.hooker.LoadedApkCtorHooker;
 import org.lsposed.lspd.hooker.LoadedApkCreateCLHooker;
+import org.lsposed.lspd.hooker.LoadedApkCtorHooker;
 import org.lsposed.lspd.hooker.OpenDexFileHooker;
 import org.lsposed.lspd.impl.LSPosedContext;
 import org.lsposed.lspd.impl.LSPosedHelper;

core/src/main/java/org/lsposed/lspd/hooker/AttachHooker.java

@@ -2,16 +2,16 @@
 
 import android.app.ActivityThread;
 
+import androidx.annotation.NonNull;
+
 import de.robv.android.xposed.XposedInit;
 import io.github.libxposed.api.XposedInterface;
-import io.github.libxposed.api.annotations.AfterInvocation;
 import io.github.libxposed.api.annotations.XposedHooker;
 
 @XposedHooker
 public class AttachHooker implements XposedInterface.Hooker {
 
-    @AfterInvocation
-    public static void afterHookedMethod(XposedInterface.AfterHookCallback callback) {
+    public static void after(@NonNull XposedInterface.AfterHookCallback callback) {
         XposedInit.loadModules((ActivityThread) callback.getThisObject());
     }
 }