fix?: Shizuku - Suspend after March update #202

aistra0528 · Mar 22, 2024 · ac2b9a9 · ac2b9a9
1 parent f6da868
commit ac2b9a9
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/app/src/main/kotlin/com/aistra/hail/utils/HShizuku.kt b/app/src/main/kotlin/com/aistra/hail/utils/HShizuku.kt
@@ -2,6 +2,7 @@ package com.aistra.hail.utils
 
 import android.annotation.SuppressLint
 import android.content.pm.PackageManager
+import android.os.Build
 import android.os.IBinder
 import android.os.ParcelFileDescriptor
 import android.os.SystemClock
@@ -93,10 +94,7 @@ object HShizuku {
         return runCatching {
             val pm = asInterface("android.content.pm.IPackageManager", "package")
             pm::class.java.getMethod(
-                "setApplicationHiddenSettingAsUser",
-                String::class.java,
-                Boolean::class.java,
-                Int::class.java
+                "setApplicationHiddenSettingAsUser", String::class.java, Boolean::class.java, Int::class.java
             ).invoke(pm, packageName, hidden, userId) as Boolean
         }.getOrElse {
             HLog.e(it)
@@ -110,6 +108,21 @@ object HShizuku {
         return runCatching {
             val pm = asInterface("android.content.pm.IPackageManager", "package")
             (when {
+                HTarget.U && Build.VERSION.SECURITY_PATCH.replace("-", "").toInt() > 20240300 -> HiddenApiBypass.invoke(
+                    pm::class.java,
+                    pm,
+                    "setPackagesSuspendedAsUser",
+                    arrayOf(packageName),
+                    suspended,
+                    null,
+                    null,
+                    if (suspended) suspendDialogInfo else null,
+                    0,
+                    callerPackage,
+                    userId /*suspendingUserId*/,
+                    userId /*targetUserId*/
+                )
+
                 HTarget.Q -> HiddenApiBypass.invoke(
                     pm::class.java,
                     pm,
@@ -137,10 +150,7 @@ object HShizuku {
                 )
 
                 HTarget.N -> pm::class.java.getMethod(
-                    "setPackagesSuspendedAsUser",
-                    Array<String>::class.java,
-                    Boolean::class.java,
-                    Int::class.java
+                    "setPackagesSuspendedAsUser", Array<String>::class.java, Boolean::class.java, Int::class.java
                 ).invoke(pm, arrayOf(packageName), suspended, userId)
 
                 else -> return false
@@ -165,8 +175,8 @@ object HShizuku {
     ).first == 0
 
     fun execute(command: String, root: Boolean = isRoot): Pair<Int, String?> = runCatching {
-        IShizukuService.Stub.asInterface(Shizuku.getBinder())
-            .newProcess(arrayOf(if (root) "su" else "sh"), null, null).run {
+        IShizukuService.Stub.asInterface(Shizuku.getBinder()).newProcess(arrayOf(if (root) "su" else "sh"), null, null)
+            .run {
                 ParcelFileDescriptor.AutoCloseOutputStream(outputStream).use {
                     it.write(command.toByteArray())
                 }
@@ -175,6 +185,5 @@ object HShizuku {
     }.getOrElse { 0 to it.stackTraceToString() }
 
     private val ParcelFileDescriptor.text
-        get() = ParcelFileDescriptor.AutoCloseInputStream(this)
-            .use { it.bufferedReader().readText() }
+        get() = ParcelFileDescriptor.AutoCloseInputStream(this).use { it.bufferedReader().readText() }
 }