perf: use remap plugin access android hidden api

lisonge · lisonge · commit 86034d721cd0 · 2026-04-10T14:59:08.000+08:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -55,7 +55,7 @@ plugins {
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlinx.atomicfu)
     alias(libs.plugins.google.ksp)
-    alias(libs.plugins.rikka.refine)
+    alias(libs.plugins.remap)
     alias(libs.plugins.loc)
 }
 
@@ -244,7 +244,6 @@ dependencies {
     implementation(libs.androidx.navigation3.ui)
     implementation(libs.androidx.navigation3.runtime)
     implementation(libs.androidx.lifecycle.viewmodel.navigation3)
-    implementation(libs.androidx.material3.adaptive.navigation3)
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
diff --git a/app/src/main/kotlin/li/songe/gkd/shizuku/PackageManager.kt b/app/src/main/kotlin/li/songe/gkd/shizuku/PackageManager.kt
@@ -2,7 +2,6 @@ package li.songe.gkd.shizuku
 
 import android.Manifest
 import android.content.pm.IPackageManager
-import android.content.pm.IPackageManagerCompat
 import android.content.pm.PackageInfo
 import li.songe.gkd.META
 import li.songe.gkd.app
@@ -28,7 +27,7 @@ class SafePackageManager(private val value: IPackageManager) {
         userId: Int = currentUserId,
     ): List<PackageInfo> = safeInvokeShizuku {
         if (AndroidTarget.CINNAMON_BUN) {
-            (value as IPackageManagerCompat).getInstalledPackages(flags.toLong(), userId).list
+            value.getInstalledPackagesV17(flags.toLong(), userId).list
         } else if (AndroidTarget.TIRAMISU) {
             value.getInstalledPackages(flags.toLong(), userId).list
         } else {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.kotlinx.atomicfu) apply false
-    alias(libs.plugins.rikka.refine) apply false
+    alias(libs.plugins.remap) apply false
     alias(libs.plugins.loc) apply false
     alias(libs.plugins.littlerobots.version)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ ktor = "3.4.2"
 atomicfu = "0.32.1"
 coil = "3.4.0"
 telephoto = "0.19.0"
-refine = "4.4.0"
+remap = "0.1.1"
 shizuku = "13.1.5"
 loc = "0.5.4"
 
@@ -44,7 +44,6 @@ androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.10.
 androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.10.0"
 androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "nav3" }
 androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "nav3" }
-androidx-material3-adaptive-navigation3 = "androidx.compose.material3.adaptive:adaptive-navigation3:1.3.0-alpha10"
 androidx-lifecycle-viewmodel-navigation3 = "androidx.lifecycle:lifecycle-viewmodel-navigation3:2.10.0"
 androidx-junit = "androidx.test.ext:junit:1.3.0"
 androidx-annotation = "androidx.annotation:annotation:1.10.0"
@@ -58,8 +57,8 @@ androidx-paging-runtime = { module = "androidx.paging:paging-runtime", version.r
 androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "paging" }
 google-accompanist-drawablepainter = "com.google.accompanist:accompanist-drawablepainter:0.37.3"
 junit = "junit:junit:4.13.2"
-rikka-refine-processor = { module = "dev.rikka.tools.refine:annotation-processor", version.ref = "refine" }
-rikka-refine-annotation = { module = "dev.rikka.tools.refine:annotation", version.ref = "refine" }
+remap-processor = { module = "li.songe.remap:remap-processor", version.ref = "remap" }
+remap-annotation = { module = "li.songe.remap:remap-annotation", version.ref = "remap" }
 rikka-shizuku-api = { module = "dev.rikka.shizuku:api", version.ref = "shizuku" }
 rikka-shizuku-provider = { module = "dev.rikka.shizuku:provider", version.ref = "shizuku" }
 lsposed-hiddenapibypass = "org.lsposed.hiddenapibypass:hiddenapibypass:6.1"
@@ -87,6 +86,6 @@ android-library = { id = "com.android.library", version.ref = "agp" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 androidx-room = { id = "androidx.room", version.ref = "room" }
 google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-rikka-refine = { id = "dev.rikka.tools.refine", version.ref = "refine" }
+remap = { id = "li.songe.remap", version.ref = "remap" }
 loc = { id = "li.songe.loc", version.ref = "loc" }
 littlerobots-version = "nl.littlerobots.version-catalog-update:1.1.0"
diff --git a/hidden_api/build.gradle.kts b/hidden_api/build.gradle.kts
@@ -13,6 +13,6 @@ android {
 
 dependencies {
     compileOnly(libs.androidx.annotation)
-    compileOnly(libs.rikka.refine.annotation)
-    annotationProcessor(libs.rikka.refine.processor)
+    compileOnly(libs.remap.annotation)
+    annotationProcessor(libs.remap.processor)
 }
diff --git a/hidden_api/src/main/java/android/accessibilityservice/AccessibilityServiceInfoHidden.java b/hidden_api/src/main/java/android/accessibilityservice/AccessibilityServiceInfoHidden.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.RequiresApi;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(AccessibilityServiceInfo.class)
+@RemapType(AccessibilityServiceInfo.class)
 public class AccessibilityServiceInfoHidden {
     public static int FLAG_FORCE_DIRECT_BOOT_AWARE;
 
diff --git a/hidden_api/src/main/java/android/app/AppOpsManagerHidden.java b/hidden_api/src/main/java/android/app/AppOpsManagerHidden.java
@@ -1,16 +1,15 @@
 package android.app;
 
-
 import android.os.Build;
 
 import androidx.annotation.RequiresApi;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(AppOpsManager.class)
+@RemapType(AppOpsManager.class)
 public class AppOpsManagerHidden {
     public static int OP_POST_NOTIFICATION;
     @RequiresApi(Build.VERSION_CODES.P)
diff --git a/hidden_api/src/main/java/android/app/TaskInfoHidden.java b/hidden_api/src/main/java/android/app/TaskInfoHidden.java
@@ -5,12 +5,12 @@
 
 import androidx.annotation.RequiresApi;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(TaskInfo.class)
+@RemapType(TaskInfo.class)
 @RequiresApi(Build.VERSION_CODES.Q)
 public class TaskInfoHidden {
     public Configuration configuration;
diff --git a/hidden_api/src/main/java/android/app/UiAutomationHidden.java b/hidden_api/src/main/java/android/app/UiAutomationHidden.java
@@ -5,12 +5,12 @@
 
 import androidx.annotation.RequiresApi;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(UiAutomation.class)
+@RemapType(UiAutomation.class)
 public class UiAutomationHidden {
 
     @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
diff --git a/hidden_api/src/main/java/android/content/ContextHidden.java b/hidden_api/src/main/java/android/content/ContextHidden.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.RequiresApi;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(Context.class)
+@RemapType(Context.class)
 public class ContextHidden {
     @RequiresApi(Build.VERSION_CODES.Q)
     public static String ACTIVITY_TASK_SERVICE;
diff --git a/hidden_api/src/main/java/android/content/pm/IPackageManager.java b/hidden_api/src/main/java/android/content/pm/IPackageManager.java
@@ -9,6 +9,8 @@
 import androidx.annotation.DeprecatedSinceApi;
 import androidx.annotation.RequiresApi;
 
+import li.songe.remap.RemapMethod;
+
 /**
  * @noinspection unused
  */
@@ -27,6 +29,10 @@ public static IPackageManager asInterface(IBinder binder) {
     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     ParceledListSlice<PackageInfo> getInstalledPackages(long flags, int userId);
 
+    // android17+
+    @RemapMethod("getInstalledPackages")
+    PackageInfoList getInstalledPackagesV17(long flags, int userId);
+
     @DeprecatedSinceApi(api = Build.VERSION_CODES.TIRAMISU)
     PackageInfo getPackageInfo(String packageName, int flags, int userId);
 
@@ -40,5 +46,4 @@ public static IPackageManager asInterface(IBinder binder) {
     void grantRuntimePermission(String packageName, String permissionName, int userId);
 
     int getApplicationEnabledSetting(String packageName, int userId);
-
 }
diff --git a/hidden_api/src/main/java/android/content/pm/IPackageManagerCompat.java b/hidden_api/src/main/java/android/content/pm/IPackageManagerCompat.java
diff --git a/hidden_api/src/main/java/android/content/pm/PackageInfoHidden.java b/hidden_api/src/main/java/android/content/pm/PackageInfoHidden.java
@@ -1,11 +1,11 @@
 package android.content.pm;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(PackageInfo.class)
+@RemapType(PackageInfo.class)
 public class PackageInfoHidden {
     public String overlayTarget;
 }
diff --git a/hidden_api/src/main/java/android/content/res/ConfigurationHidden.java b/hidden_api/src/main/java/android/content/res/ConfigurationHidden.java
@@ -5,12 +5,12 @@
 
 import androidx.annotation.RequiresApi;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(Configuration.class)
+@RemapType(Configuration.class)
 public class ConfigurationHidden {
     @RequiresApi(Build.VERSION_CODES.P)
     public WindowConfiguration windowConfiguration;
diff --git a/hidden_api/src/main/java/android/hardware/input/InputManagerHidden.java b/hidden_api/src/main/java/android/hardware/input/InputManagerHidden.java
@@ -1,12 +1,12 @@
 package android.hardware.input;
 
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(InputManager.class)
+@RemapType(InputManager.class)
 public class InputManagerHidden {
     public static int INJECT_INPUT_EVENT_MODE_ASYNC;
     public static int INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH;
diff --git a/hidden_api/src/main/java/android/view/KeyEventHidden.java b/hidden_api/src/main/java/android/view/KeyEventHidden.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.RequiresApi;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(KeyEvent.class)
+@RemapType(KeyEvent.class)
 public class KeyEventHidden {
     @RequiresApi(Build.VERSION_CODES.Q)
     public void setDisplayId(int displayId) {
diff --git a/hidden_api/src/main/java/android/view/MotionEventHidden.java b/hidden_api/src/main/java/android/view/MotionEventHidden.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.RequiresApi;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(MotionEvent.class)
+@RemapType(MotionEvent.class)
 public class MotionEventHidden {
     @RequiresApi(Build.VERSION_CODES.Q)
     public static MotionEvent obtain(long downTime, long eventTime, int action, int pointerCount, MotionEvent.PointerProperties[] pointerProperties, MotionEvent.PointerCoords[] pointerCoords, int metaState, int buttonState, float xPrecision, float yPrecision, int deviceId, int edgeFlags, int source, int displayId, int flags) {
diff --git a/hidden_api/src/main/java/android/view/SurfaceControlHidden.java b/hidden_api/src/main/java/android/view/SurfaceControlHidden.java
@@ -4,12 +4,12 @@
 import android.graphics.Rect;
 import android.os.IBinder;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(SurfaceControl.class)
+@RemapType(SurfaceControl.class)
 public class SurfaceControlHidden {
     public static IBinder getInternalDisplayToken() {
         throw new RuntimeException();
diff --git a/hidden_api/src/main/java/android/view/accessibility/AccessibilityNodeInfoHidden.java b/hidden_api/src/main/java/android/view/accessibility/AccessibilityNodeInfoHidden.java
@@ -2,12 +2,12 @@
 
 import android.graphics.Rect;
 
-import dev.rikka.tools.refine.RefineAs;
+import li.songe.remap.RemapType;
 
 /**
  * @noinspection unused
  */
-@RefineAs(AccessibilityNodeInfo.class)
+@RemapType(AccessibilityNodeInfo.class)
 public class AccessibilityNodeInfoHidden {
     public Rect getBoundsInScreen() {
         throw new RuntimeException();

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ plugins {`
`21`	`21`	`alias(libs.plugins.kotlin.parcelize) apply false`
`22`	`22`	`alias(libs.plugins.kotlin.compose) apply false`
`23`	`23`	`alias(libs.plugins.kotlinx.atomicfu) apply false`
`24`		`- alias(libs.plugins.rikka.refine) apply false`
	`24`	`+ alias(libs.plugins.remap) apply false`
`25`	`25`	`alias(libs.plugins.loc) apply false`
`26`	`26`	`alias(libs.plugins.littlerobots.version)`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ android {`
`13`	`13`
`14`	`14`	`dependencies {`
`15`	`15`	`compileOnly(libs.androidx.annotation)`
`16`		`- compileOnly(libs.rikka.refine.annotation)`
`17`		`- annotationProcessor(libs.rikka.refine.processor)`
	`16`	`+ compileOnly(libs.remap.annotation)`
	`17`	`+ annotationProcessor(libs.remap.processor)`
`18`	`18`	`}`