Update/port to 117.0.5938.60

GrapheneOS · Sep 12, 2023 · 4c1dcde · 4c1dcde
1 parent e58378a
commit 4c1dcde
Show file tree

Hide file tree

Showing 9 changed files with 310 additions and 272 deletions.
diff --git a/args.gn b/args.gn
@@ -3,11 +3,11 @@ target_os = "android"
 target_cpu = "arm64"
 
 android_channel = "stable"
-android_default_version_name = "117.0.5938.44"
-android_default_version_code = "593804400"
+android_default_version_name = "117.0.5938.60"
+android_default_version_code = "593806000"
 
 ext_version_enabled = true
-ext_version_increment = "1"
+ext_version_increment = "0"
 
 is_component_build = false
 is_debug = false

diff --git a/patches/0001-disable-checkout_nacl.patch b/patches/0001-disable-checkout_nacl.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index d50afb0333fa2..db9d00f4c1410 100644
+index c7df11791a13b..45afbefcd47f5 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -119,7 +119,7 @@ vars = {

diff --git a/patches/0009-Vanadium-string-rebranding.patch b/patches/0009-Vanadium-string-rebranding.patch
diff --git a/patches/0060-Utility-class-for-modifying-preferences-at-Privacy-s.patch b/patches/0060-Utility-class-for-modifying-preferences-at-Privacy-s.patch
@@ -8,8 +8,8 @@ Subject: [PATCH] Utility class for modifying preferences at Privacy section
  chrome/android/chrome_ext_java_sources.gni    |  1 +
  .../java/res/xml/privacy_preferences_ext.xml  |  9 +++
  .../privacy/settings/PrivacySettings.java     |  6 ++
- .../privacy/settings/PrivacySettingsExt.java  | 69 +++++++++++++++++++
- 5 files changed, 86 insertions(+)
+ .../privacy/settings/PrivacySettingsExt.java  | 72 +++++++++++++++++++
+ 5 files changed, 89 insertions(+)
  create mode 100644 chrome/android/java/res/xml/privacy_preferences_ext.xml
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 
@@ -81,10 +81,10 @@ index 2429268892127..814bd064d67eb 100644
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 new file mode 100644
-index 0000000000000..4bf3be9576c22
+index 0000000000000..a9acd9e82ee60
 --- /dev/null
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,72 @@
 +// Copyright 2023 GrapheneOS
 +// Use of this source code is governed by a GPLv2-style license that can be
 +// found in the LICENSE file.
@@ -124,13 +124,16 @@ index 0000000000000..4bf3be9576c22
 +    }
 +
 +    private static final ChromeManagedPreferenceDelegate getDelegate(@NonNull Profile profile) {
-+        return pref -> {
-+            PrefService prefService = UserPrefs.get(profile);
-+            if (pref == null) {
++        return new ChromeManagedPreferenceDelegate() {
++            @Override
++            public boolean isPreferenceControlledByPolicy(Preference pref) {
++                PrefService prefService = UserPrefs.get(profile);
++                if (pref == null) {
++                    return false;
++                }
++                String key = pref.getKey();
 +                return false;
 +            }
-+            String key = pref.getKey();
-+            return false;
 +        };
 +    }
 +

diff --git a/patches/0070-Move-search-suggestions-back-to-privacy-section.patch b/patches/0070-Move-search-suggestions-back-to-privacy-section.patch
@@ -24,7 +24,7 @@ index a352cd657b1b9..01e8c8217afed 100644
  </PreferenceScreen>
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
-index 4bf3be9576c22..307c8d8134b6e 100644
+index a9acd9e82ee60..2db54e2fa4497 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 @@ -25,6 +25,8 @@ import org.chromium.components.user_prefs.UserPrefs;
@@ -46,17 +46,17 @@ index 4bf3be9576c22..307c8d8134b6e 100644
              return true;
          };
      }
-@@ -43,6 +48,9 @@ final class PrivacySettingsExt {
+@@ -45,6 +50,9 @@ final class PrivacySettingsExt {
+                     return false;
+                 }
+                 String key = pref.getKey();
++                if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
++                    return prefService.isManagedPreference(Pref.SEARCH_SUGGEST_ENABLED);
++                }
                  return false;
              }
-             String key = pref.getKey();
-+            if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
-+                return prefService.isManagedPreference(Pref.SEARCH_SUGGEST_ENABLED);
-+            }
-             return false;
          };
-     }
-@@ -60,10 +68,22 @@ final class PrivacySettingsExt {
+@@ -63,10 +71,22 @@ final class PrivacySettingsExt {
          int SECURITY_PREFERENCES_ORDER =
                  ChromeFeatureList.isEnabled(ChromeFeatureList.PRIVACY_SANDBOX_SETTINGS_4) ? 2 : 9999;
          SettingsUtils.addPreferencesFromResource(prefFragment, R.xml.privacy_preferences_ext);

diff --git a/patches/0087-Toggle-for-closing-tabs-on-exit.patch b/patches/0087-Toggle-for-closing-tabs-on-exit.patch
@@ -82,7 +82,7 @@ index 0000000000000..e004200c3102c
 +
 +}
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
-index 307c8d8134b6e..866b0b17fc725 100644
+index 2db54e2fa4497..60afa9f0c9e51 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 @@ -26,6 +26,7 @@ import org.chromium.components.user_prefs.UserPrefs;
@@ -102,7 +102,7 @@ index 307c8d8134b6e..866b0b17fc725 100644
              }
              return true;
          };
-@@ -75,6 +78,13 @@ final class PrivacySettingsExt {
+@@ -78,6 +81,13 @@ final class PrivacySettingsExt {
              searchSuggestionsPref.setOnPreferenceChangeListener(getListener(profile));
              searchSuggestionsPref.setManagedPreferenceDelegate(getDelegate(profile));
          }
@@ -116,7 +116,7 @@ index 307c8d8134b6e..866b0b17fc725 100644
      }
 
      static void updatePreferences(@NonNull PreferenceFragmentCompat prefFragment, @NonNull Profile profile) {
-@@ -85,5 +95,11 @@ final class PrivacySettingsExt {
+@@ -88,5 +98,11 @@ final class PrivacySettingsExt {
          SettingsExtUtils.safelyUpdateSwitchPreference(/* switchPref */ searchSuggestionsPref,
                  /* newSummary*/ null,
                  /* newCheckedValue*/ prefService.getBoolean(Pref.SEARCH_SUGGEST_ENABLED));

diff --git a/patches/0088-Toggle-for-navigating-external-URL-in-incognito.patch b/patches/0088-Toggle-for-navigating-external-URL-in-incognito.patch
@@ -108,7 +108,7 @@ index e004200c3102c..91fee9ee6bef3 100644
 +    }
  }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
-index 866b0b17fc725..0b3c42b0e37c2 100644
+index 60afa9f0c9e51..94a45a56c2b1b 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 @@ -27,6 +27,8 @@ final class PrivacySettingsExt {
@@ -129,7 +129,7 @@ index 866b0b17fc725..0b3c42b0e37c2 100644
              }
              return true;
          };
-@@ -85,6 +89,13 @@ final class PrivacySettingsExt {
+@@ -88,6 +92,13 @@ final class PrivacySettingsExt {
              closeTabsOnExitPref.setOrder(PRIVACY_PREFERENCES_ORDER);
              closeTabsOnExitPref.setOnPreferenceChangeListener(getListener(profile));
          }
@@ -143,7 +143,7 @@ index 866b0b17fc725..0b3c42b0e37c2 100644
      }
 
      static void updatePreferences(@NonNull PreferenceFragmentCompat prefFragment, @NonNull Profile profile) {
-@@ -101,5 +112,11 @@ final class PrivacySettingsExt {
+@@ -104,5 +115,11 @@ final class PrivacySettingsExt {
          SettingsExtUtils.safelyUpdateSwitchPreference(/* switchPref */ closeTabsOnExitPref,
                  /* newSummary*/ null,
                  /* newCheckedValue*/ SharedPrefsExt.CLOSE_TABS_ON_EXIT.get());

diff --git a/patches/0089-Implement-UI-for-WebRTC-toggle.patch b/patches/0089-Implement-UI-for-WebRTC-toggle.patch
@@ -137,7 +137,7 @@ index 0000000000000..f90f9d7231ff9
 +        android:key="webrtc_policy" />
 +</PreferenceScreen>
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
-index 0b3c42b0e37c2..01757dc68b41b 100644
+index 94a45a56c2b1b..ecc59873336e8 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 @@ -17,6 +17,7 @@ import org.chromium.chrome.browser.preferences.SharedPrefsUtils.SharedPrefsExt;
@@ -156,7 +156,7 @@ index 0b3c42b0e37c2..01757dc68b41b 100644
 
      private static final Preference.OnPreferenceChangeListener getListener(@NonNull Profile profile) {
          return (pref, val) -> {
-@@ -96,6 +98,11 @@ final class PrivacySettingsExt {
+@@ -99,6 +101,11 @@ final class PrivacySettingsExt {
              openLinksInIncognitoPref.setOrder(PRIVACY_PREFERENCES_ORDER);
              openLinksInIncognitoPref.setOnPreferenceChangeListener(getListener(profile));
          }
@@ -168,7 +168,7 @@ index 0b3c42b0e37c2..01757dc68b41b 100644
      }
 
      static void updatePreferences(@NonNull PreferenceFragmentCompat prefFragment, @NonNull Profile profile) {
-@@ -118,5 +125,9 @@ final class PrivacySettingsExt {
+@@ -121,5 +128,9 @@ final class PrivacySettingsExt {
          SettingsExtUtils.safelyUpdateSwitchPreference(/* switchPref */ openLinksInIncognitoPref,
                  /* newSummary*/ null,
                  /* newCheckedValue*/ SharedPrefsExt.OPEN_LINKS_IN_INCOGNITO.get());

diff --git a/patches/0117-make-cross-origin-referrer-behavior-configurable.patch b/patches/0117-make-cross-origin-referrer-behavior-configurable.patch
@@ -148,7 +148,7 @@ index 6e955e33c0109..356e4204e1cd2 100644
  </PreferenceScreen>
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
-index 01757dc68b41b..93b26c6fe3d22 100644
+index ecc59873336e8..f68ef522bbaa3 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsExt.java
 @@ -15,6 +15,7 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -167,7 +167,7 @@ index 01757dc68b41b..93b26c6fe3d22 100644
 
      private static final Preference.OnPreferenceChangeListener getListener(@NonNull Profile profile) {
          return (pref, val) -> {
-@@ -103,6 +105,12 @@ final class PrivacySettingsExt {
+@@ -106,6 +108,12 @@ final class PrivacySettingsExt {
          if (webRtcPolicyPref != null) {
              webRtcPolicyPref.setOrder(PRIVACY_PREFERENCES_ORDER);
          }
@@ -180,7 +180,7 @@ index 01757dc68b41b..93b26c6fe3d22 100644
      }
 
      static void updatePreferences(@NonNull PreferenceFragmentCompat prefFragment, @NonNull Profile profile) {
-@@ -129,5 +137,12 @@ final class PrivacySettingsExt {
+@@ -132,5 +140,12 @@ final class PrivacySettingsExt {
          Preference webRtcPolicyPref = prefFragment.findPreference(PREF_WEBRTC_POLICY);
          SettingsExtUtils.safelyUpdatePreference(/* preference */ webRtcPolicyPref,
                  /* newSummary */ WebRtcPolicySettings.getWebRtcPolicySummaryString(prefFragment.getContext()));