Merge branch 'library'

# Conflicts: # app/build.gradle.kts # hidden-api-stubs/build.gradle.kts
timschneeb · Dec 6, 2024 · a565624 · a565624
2 parents 4c9c94e + a9da37f
commit a565624
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 34 deletions.
diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/session/shared/BaseSessionManager.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/session/shared/BaseSessionManager.kt
@@ -206,7 +206,8 @@ abstract class BaseSessionManager(protected val context: Context) : DumpManager.
         controllers ?: return
         controllers.forEach {
             Timber.d("active session changed: package ${it.packageName}; " +
-                    "uid ${Refine.unsafeCast<MediaSessionHidden.TokenHidden>(it.sessionToken).uid}; " +
+                    // Refine is not working with nested classes anymore
+                    // "uid ${Refine.unsafeCast<MediaSessionHidden.TokenHidden>(it.sessionToken).uid}; " +
                     "usage ${it.playbackInfo?.audioAttributes?.usage}")
         }
 

diff --git a/codeview/build.gradle b/codeview/build.gradle
@@ -11,6 +11,15 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     buildTypes {
         release {
             minifyEnabled false

diff --git a/hidden-api-impl/build.gradle.kts b/hidden-api-impl/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     namespace = "me.timschneeberger.hiddenapi_impl"
 }

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
@@ -1,7 +1,5 @@
 package me.timschneeberger.hiddenapi_impl;
 
-import android.app.AppOpsManager;
-import android.app.AppOpsManagerHidden;
 import android.media.IAudioPolicyService;
 import android.os.Build;
 import android.os.IBinder;
@@ -11,7 +9,7 @@
 
 import com.android.internal.app.IAppOpsService;
 
-import java.util.Objects;
+import java.lang.reflect.Method;
 
 import rikka.shizuku.ShizukuBinderWrapper;
 import rikka.shizuku.SystemServiceHelper;
@@ -73,22 +71,36 @@ public static void PermissionManager_grantRuntimePermission(String packageName,
 
     public static boolean AppOpsService_setMode(String op, int packageUid, String packageName, String mode) throws RemoteException {
         int index = -1;
-        for(int i = 0; i <= 10; i++) {
-            if(mode.equals(AppOpsManagerHidden.modeToName(i))) {
-                index = i;
-                break;
+
+        try {
+            Method method = Class.forName("android.app.AppOpsManager")
+                    .getMethod("modeToName", int.class);
+
+            for(int i = 0; i <= 10; i++) {
+                if(mode.equals((String)method.invoke(null, i))) {
+                    index = i;
+                    break;
+                }
             }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
 
         int opIndex = -1;
         try {
-            opIndex = AppOpsManagerHidden.strOpToOp(op);
+            Method method = Class.forName("android.app.AppOpsManager")
+                    .getMethod("strOpToOp", String.class);
+
+            opIndex = (int) method.invoke(null, op);
         }
-        catch(IllegalArgumentException ignored) {}
+        catch(Exception ignored) {}
         try {
-            opIndex = AppOpsManagerHidden.strDebugOpToOp(op);
+            Method method = Class.forName("android.app.AppOpsManager")
+                    .getMethod("strDebugOpToOp", String.class);
+
+            opIndex = (int) method.invoke(null, op);
         }
-        catch(IllegalArgumentException ignored) {}
+        catch(Exception ignored) {}
 
         if(index < 0 || opIndex < 0)
             return false;

diff --git a/hidden-api-refined/build.gradle.kts b/hidden-api-refined/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     namespace = "me.timschneeberger.hiddenapi_refine"
 }

diff --git a/hidden-api-refined/src/main/java/android/app/AppOpsManagerHidden.java b/hidden-api-refined/src/main/java/android/app/AppOpsManagerHidden.java