Merge pull request #5 from whew-inc/compatibility

Compatibility
whew-inc · Jun 23, 2022 · b5827ed · b5827ed
2 parents e4c315d + 74d327f
commit b5827ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.thermatk.android.xf.fakegapps"
         minSdkVersion 15
         targetSdkVersion 32
-        versionCode 7
-        versionName "3.3"
+        versionCode 8
+        versionName "4"
     }
     signingConfigs {
         release {

diff --git a/app/src/main/java/com/thermatk/android/xf/fakegapps/FakeSignatures.java b/app/src/main/java/com/thermatk/android/xf/fakegapps/FakeSignatures.java
@@ -2,6 +2,7 @@
 
 import android.content.pm.PackageInfo;
 import android.content.pm.Signature;
+import android.os.Build;
 
 import de.robv.android.xposed.IXposedHookLoadPackage;
 import de.robv.android.xposed.XC_MethodHook;
@@ -31,14 +32,9 @@ protected void afterHookedMethod(MethodHookParam param) {
             }
         };
 
-        Class<?> PackageManagerServiceComputer = null;
-        try {
-            PackageManagerServiceComputer = XposedHelpers.findClass("com.android.server.pm.PackageManagerService.ComputerEngine", loadedPackage.classLoader);
-        } catch (Exception ignored) {}
-        if (PackageManagerServiceComputer != null) {
-            XposedBridge.hookAllMethods(PackageManagerServiceComputer, "generatePackageInfo", hook);
-        }
-        final Class<?> PackageManagerService = XposedHelpers.findClass("com.android.server.pm.PackageManagerService", loadedPackage.classLoader);
-        XposedBridge.hookAllMethods(PackageManagerService, "generatePackageInfo", hook);
+        String classToHook = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ?
+                "com.android.server.pm.PackageManagerService.ComputerEngine" : "com.android.server.pm.PackageManagerService";
+        final Class<?> hookedClass = XposedHelpers.findClass(classToHook, loadedPackage.classLoader);
+        XposedBridge.hookAllMethods(hookedClass, "generatePackageInfo", hook);
     }
 }