fix: grantSelf failed

Author: lisonge

app/src/main/kotlin/li/songe/gkd/shizuku/AppOpsService.kt

@@ -31,29 +31,20 @@ class SafeAppOpsService(
         val supportCreateA11yOverlay get() = a11yOverlayOk
     }
 
-    fun checkOperation(
-        code: Int,
-        uid: Int = currentUserId,
-        packageName: String,
-    ): Int? = safeInvokeShizuku {
-        value.checkOperation(code, uid, packageName)
+    fun checkOperation(code: Int): Int? = safeInvokeShizuku {
+        value.checkOperation(code, android.os.Process.myUid(), META.appId)
     }
 
-    fun setMode(
-        code: Int,
-        uid: Int = currentUserId,
-        packageName: String,
-        mode: Int
-    ) = safeInvokeShizuku {
-        value.setMode(code, uid, packageName, mode)
+    fun setMode(code: Int, mode: Int) = safeInvokeShizuku {
+        value.setMode(code, android.os.Process.myUid(), META.appId, mode)
     }
 
     private fun setAllowSelfMode(code: Int) {
-        val m = checkOperation(code = code, packageName = META.appId) ?: return
+        val m = checkOperation(code = code) ?: return
         if (m == AppOpsManager.MODE_ALLOWED) {
             return
         }
-        setMode(code = code, packageName = META.appId, mode = AppOpsManager.MODE_ALLOWED)
+        setMode(code = code, mode = AppOpsManager.MODE_ALLOWED)
     }
 
     fun allowAllSelfMode() {

app/src/main/kotlin/li/songe/gkd/shizuku/PackageManager.kt

@@ -9,7 +9,7 @@ import li.songe.gkd.permission.Manifest_permission_GET_APP_OPS_STATS
 import li.songe.gkd.permission.canQueryPkgState
 import li.songe.gkd.util.AndroidTarget
 
-@Suppress("unused")
+
 class SafePackageManager(private val value: IPackageManager) {
     companion object {
 
@@ -33,6 +33,7 @@ class SafePackageManager(private val value: IPackageManager) {
         }
     } ?: emptyList()
 
+    @Suppress("unused")
     fun getPackageInfo(
         packageName: String,
         flags: Int,
@@ -74,13 +75,6 @@ class SafePackageManager(private val value: IPackageManager) {
         )
     }
 
-    fun checkUidPermission(permName: String, uid: Int): Int? = safeInvokeShizuku {
-        value.checkUidPermission(
-            permName,
-            uid
-        )
-    }
-
     fun allowAllSelfPermission() {
         if (canUseGetInstalledApps && !canQueryPkgState.value) {
             try {

app/src/main/kotlin/li/songe/gkd/shizuku/ShizukuApi.kt

@@ -3,8 +3,6 @@ package li.songe.gkd.shizuku
 
 import android.content.ComponentName
 import android.content.pm.PackageManager
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.annotation.WorkerThread
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -85,9 +83,20 @@ fun Class<*>.detectHiddenMethod(
 }
 
 // https://github.com/android-cs/16/blob/main/packages/Shell/AndroidManifest.xml
-@RequiresApi(Build.VERSION_CODES.P)
-private const val Manifest_permission_MANAGE_APP_OPS_MODES =
-    "android.permission.MANAGE_APP_OPS_MODES"
+private fun checkRemotePermission(permission: String): Boolean {
+    return Shizuku.checkRemotePermission(permission) == PackageManager.PERMISSION_GRANTED
+}
+
+private val isAdbRestricted: Boolean
+    get() {
+        if (!checkRemotePermission("android.permission.GRANT_RUNTIME_PERMISSIONS")) {
+            return true
+        }
+        if (AndroidTarget.P && !checkRemotePermission("android.permission.MANAGE_APP_OPS_MODES")) {
+            return true
+        }
+        return false
+    }
 
 class ShizukuContext(
     val serviceWrapper: UserServiceWrapper?,
@@ -125,13 +134,7 @@ class ShizukuContext(
     fun grantSelf() {
         packageManager ?: return
         appOpsService ?: return
-        if (AndroidTarget.P && Shizuku.checkRemotePermission(
-                Manifest_permission_MANAGE_APP_OPS_MODES
-            ) == PackageManager.PERMISSION_DENIED
-        ) {
-            // 部分 ROM 会限制 ADB 权限
-            return
-        }
+        if (isAdbRestricted) return
         appOpsService.allowAllSelfMode()
         packageManager.allowAllSelfPermission()
     }

hidden_api/src/main/java/android/content/pm/IPackageManager.java

@@ -37,8 +37,6 @@ public static IPackageManager asInterface(IBinder binder) {
 
     int checkPermission(String permName, String pkgName, int userId);
 
-    int checkUidPermission(String permName, int uid);
-
     void grantRuntimePermission(String packageName, String permissionName, int userId);
 
     int getApplicationEnabledSetting(String packageName, int userId);