fix: remove nested try/catch

timschneeb · Dec 22, 2024 · 9f5960c · 9f5960c
1 parent 0d74de9
commit 9f5960c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/hidden-api-impl/src/main/java/me/timschneeberger/hiddenapi_impl/ShizukuSystemServerApi.java b/hidden-api-impl/src/main/java/me/timschneeberger/hiddenapi_impl/ShizukuSystemServerApi.java
@@ -54,10 +54,11 @@ public static void PermissionManager_grantRuntimePermission(String packageName,
             else if (Build.VERSION.SDK_INT == 34) {
                 try {
                     PERMISSION_MANAGER.getOrThrow().grantRuntimePermission(packageName, permissionName, 0, userId);
+                    return;
                 }
-                catch (NoSuchMethodError e) {
-                    PERMISSION_MANAGER.getOrThrow().grantRuntimePermission(packageName, permissionName, userId);
-                }
+                catch (NoSuchMethodError ignored) {}
+                // Retry with old method
+                PERMISSION_MANAGER.getOrThrow().grantRuntimePermission(packageName, permissionName, userId);
             } else {
                 PERMISSION_MANAGER.getOrThrow().grantRuntimePermission(packageName, permissionName, userId);
             }

diff --git a/hidden-api-stubs/src/main/java/android/permission/IPermissionManager.java b/hidden-api-stubs/src/main/java/android/permission/IPermissionManager.java
@@ -19,12 +19,6 @@ void grantRuntimePermission(String packageName, String permissionName, int devic
     void grantRuntimePermission(String packageName, String permissionName, String deviceId, int userId)
             throws RemoteException;
 
-    void revokeRuntimePermission(String packageName, String permissionName, int userId,
-                                 String reason) throws RemoteException;
-
-    void revokeRuntimePermission(String packageName, String permissionName, int deviceId, int userId, String reason)
-            throws RemoteException;
-
     abstract class Stub extends Binder implements IPermissionManager {
 
         public static IPermissionManager asInterface(IBinder obj) {