Rework to unbreak Android 11 (needs testing)

Author: nift4

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.thermatk.android.xf.fakegapps"
         minSdkVersion 15
         targetSdkVersion 32
-        versionCode 6
-        versionName "3.2"
+        versionCode 7
+        versionName "3.3"
     }
     signingConfigs {
         release {

app/src/main/java/com/thermatk/android/xf/fakegapps/FakeSignatures.java

@@ -15,13 +15,7 @@ public void handleLoadPackage(LoadPackageParam loadedPackage) {
         if (!loadedPackage.packageName.equals("android"))
             return;
 
-        Class<?> PackageManagerService;
-        try {
-            PackageManagerService = XposedHelpers.findClass("com.android.server.pm.PackageManagerService.ComputerEngine", loadedPackage.classLoader);
-        } catch (Exception e) {
-            PackageManagerService = XposedHelpers.findClass("com.android.server.pm.PackageManagerService", loadedPackage.classLoader);
-        }
-        XposedBridge.hookAllMethods(PackageManagerService, "generatePackageInfo", new XC_MethodHook() {
+        XC_MethodHook hook = new XC_MethodHook() {
             @Override
             protected void afterHookedMethod(MethodHookParam param) {
                 PackageInfo pi = (PackageInfo) param.getResult();
@@ -35,6 +29,16 @@ 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);
     }
 }