From 1576384e023185ffe89d4b1e4bef3df5f7b24e3f Mon Sep 17 00:00:00 2001
From: Carmelo Messina <uazo@users.noreply.github.com>
Date: Wed, 6 Jul 2022 14:18:39 +0200
Subject: [PATCH] Remove preload of com.google.android.gms.fonts

---
 build/patches/remove-gms-preload-font.patch | 69 +++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 build/patches/remove-gms-preload-font.patch

diff --git a/build/patches/remove-gms-preload-font.patch b/build/patches/remove-gms-preload-font.patch
new file mode 100644
index 00000000..f09f9b5b
--- /dev/null
+++ b/build/patches/remove-gms-preload-font.patch
@@ -0,0 +1,69 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Wed, 6 Jul 2022 09:37:25 +0000
+Subject: Remove preload of com.google.android.gms.fonts
+
+---
+ chrome/android/java/res_base/font/chrome_google_sans.xml  | 8 +-------
+ .../java/res_base/font/chrome_google_sans_bold.xml        | 8 +-------
+ .../java/res_base/font/chrome_google_sans_medium.xml      | 8 +-------
+ .../org/chromium/chrome/browser/fonts/FontPreloader.java  | 1 +
+ 4 files changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/chrome/android/java/res_base/font/chrome_google_sans.xml b/chrome/android/java/res_base/font/chrome_google_sans.xml
+--- a/chrome/android/java/res_base/font/chrome_google_sans.xml
++++ b/chrome/android/java/res_base/font/chrome_google_sans.xml
+@@ -6,10 +6,4 @@
+ <font-family
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     xmlns:tools="http://schemas.android.com/tools"
+-    tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
+-    app:fontProviderAuthority="com.google.android.gms.fonts"
+-    app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
+-    app:fontProviderFetchStrategy="async"
+-    app:fontProviderPackage="com.google.android.gms"
+-    app:fontProviderQuery="Google Sans"
+-    app:fontProviderSystemFontFamily="google-sans"/>
++    tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/>
+diff --git a/chrome/android/java/res_base/font/chrome_google_sans_bold.xml b/chrome/android/java/res_base/font/chrome_google_sans_bold.xml
+--- a/chrome/android/java/res_base/font/chrome_google_sans_bold.xml
++++ b/chrome/android/java/res_base/font/chrome_google_sans_bold.xml
+@@ -6,10 +6,4 @@
+ <font-family
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     xmlns:tools="http://schemas.android.com/tools"
+-    tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
+-    app:fontProviderAuthority="com.google.android.gms.fonts"
+-    app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
+-    app:fontProviderFetchStrategy="async"
+-    app:fontProviderPackage="com.google.android.gms"
+-    app:fontProviderQuery="Google Sans:700"
+-    app:fontProviderSystemFontFamily="google-sans-bold"/>
++    tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/>
+diff --git a/chrome/android/java/res_base/font/chrome_google_sans_medium.xml b/chrome/android/java/res_base/font/chrome_google_sans_medium.xml
+--- a/chrome/android/java/res_base/font/chrome_google_sans_medium.xml
++++ b/chrome/android/java/res_base/font/chrome_google_sans_medium.xml
+@@ -6,10 +6,4 @@
+ <font-family
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     xmlns:tools="http://schemas.android.com/tools"
+-    tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
+-    app:fontProviderAuthority="com.google.android.gms.fonts"
+-    app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
+-    app:fontProviderFetchStrategy="async"
+-    app:fontProviderPackage="com.google.android.gms"
+-    app:fontProviderQuery="Google Sans:500"
+-    app:fontProviderSystemFontFamily="google-sans-medium"/>
++    tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java
+@@ -70,6 +70,7 @@ public class FontPreloader {
+         mThreadChecker.assertOnValidThread();
+         if (!mInitialized) {
+             mInitialized = true;
++            if ((true)) return;
+             context = context.getApplicationContext();
+             OnFontCallback callback = new OnFontCallback();
+             for (int font : mFonts) {
+--
+2.25.1