commit c2b0b285d9ad8bfb58fd3213b64a70640d9adfd2
author Jonathan Klee <jonathan.klee@e.email> Thu Dec 19 02:42:04 2024 +0200
committer max.weninger <max.weninger@gmail.com> Mon Feb 17 11:01:12 2025 +0000
tree 83c2ee4d9766604fcb2c69b5f2a05c82e3e612a5
parent a48378b9f3eed99c59e00a844051777cf4813531

Reapply "Allow spoofing signingInfo for microG Companion/Services"

- Spoof PackageInfo signingInfo + signatures so that
  G suite apps do not complain anymore.

Compared to the previous CalyxOS patch, this fixes:
E AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: main
E AndroidRuntime: java.lang.NullPointerException: Attempt to read from field 'android.content.pm.Signature[] android.content.pm.PackageInfo.signatures' on a null object reference in method 'android.content.pm.PackageInfo com.android.server.pm.ComputerEngine.generatePackageInfo(com.android.server.pm.pkg.PackageStateInternal, long, int)'

Co-authored-by: althafvly <althafvly@gmail.com>
Co-authored-by: Michael Bestas <mkbestas@gmail.com>
Original-Change-Id: I86f182c9e1d18b0e997803842577a90ef740cfd1
Change-Id: Ie480255ed3bd80809803698752cafb3a2ecc3a33

services/core/java/com/android/server/pm/ComputerEngine.java

diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index 64c0b9d..83ddb9f 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -167,6 +167,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
+import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1544,6 +1545,21 @@
                 return null;
             }
 
+            if (isMicroG) {
+                try {
+                    packageInfo.signingInfo = new SigningInfo(
+                            new SigningDetails(
+                                    packageInfo.signatures,
+                                    SigningDetails.SignatureSchemeVersion.SIGNING_BLOCK_V3,
+                                    SigningDetails.toSigningKeys(packageInfo.signatures),
+                                    null
+                            )
+                    );
+                } catch (CertificateException e) {
+                    Slog.e(TAG, "Caught an exception when creating signing keys: ", e);
+                }
+            }
+
             packageInfo.packageName = packageInfo.applicationInfo.packageName =
                     resolveExternalPackageName(p);