fix settings crash due to NPE

From 2e8d1983cb05b1121b2142f1589fd6e6d63b2fe2 Mon Sep 17 00:00:00 2001

From ab4155b7802ad67567f387ff8e62ce30d5bc4edd Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Mon, 12 Feb 2024 13:41:11 +0530

Subject: Remove google pref from main menu

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 .../src/org/chromium/chrome/browser/settings/MainSettings.java | 3 +++

 1 file changed, 3 insertions(+)

 .../chromium/chrome/browser/settings/MainSettings.java   | 9 +++++++--

 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

index 02a7e75bb7c81..0216913d51be6 100644

index 3f521a8a07acb..2c2a067d4f073 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

@@ -340,6 +340,9 @@ public class MainSettings extends ChromeBaseSettingsFragment

@@ -407,6 +407,9 @@ public class MainSettings extends ChromeBaseSettingsFragment

         TemplateUrlService templateUrlService =

                 TemplateUrlServiceFactory.getForProfile(getProfile());

         if (!templateUrlService.isLoaded()) {

             templateUrlService.registerLoadListener(this);

             templateUrlService.load();

@@ -576,8 +579,10 @@ public class MainSettings extends ChromeBaseSettingsFragment

         }

         if (ChromeFeatureList.sAndroidSettingsContainment.isEnabled()) {

             // TODO(crbug.com/439911511): Remove old resources once the feature is launched.

-            findPreference(PREF_GOOGLE_SERVICES)

-                    .setIcon(R.drawable.ic_google_services_48dp_with_bg_containment);

+            Preference googleServices = findPreference(PREF_GOOGLE_SERVICES);

+            if (googleServices != null) {

+                googleServices.setIcon(R.drawable.ic_google_services_48dp_with_bg_containment);

+            }

         }

         if (shouldShowDefaultBrowserSetting()) {

-- 

2.53.0