Release 86.0.4240.70

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 86.0.4240.70
+* fixed crash on unused menu item tap (fixes https://github.com/bromite/bromite/issues/760)
+* fixed issue on new installations without DoH configuration (fixes https://github.com/bromite/bromite/issues/761)
+
 # 86.0.4240.66
 * switch to upstream UI for DoH URL customization
 * remove weblayer dependency on Play Services

build/RELEASE

@@ -1 +1 @@
-86.0.4240.66
+86.0.4240.70

build/patches/Add-history-support-in-incognito-mode.patch

@@ -103,7 +103,7 @@ old mode 100644
 new mode 100755
 --- a/chrome/browser/history/history_tab_helper.cc
 +++ b/chrome/browser/history/history_tab_helper.cc
-@@ -26,6 +26,9 @@
+@@ -28,6 +28,9 @@
  
  #if defined(OS_ANDROID)
  #include "chrome/browser/android/background_tab_manager.h"
@@ -113,7 +113,7 @@ new mode 100755
  #else
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
-@@ -227,6 +230,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
+@@ -238,6 +241,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
  history::HistoryService* HistoryTabHelper::GetHistoryService() {
    Profile* profile =
        Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ -127,7 +127,7 @@ new mode 100755
    if (profile->IsOffTheRecord())
      return NULL;
  
-@@ -234,6 +244,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+@@ -245,6 +255,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
        profile, ServiceAccessType::IMPLICIT_ACCESS);
  }
  
@@ -176,7 +176,7 @@ new mode 100755
  #if BUILDFLAG(ENABLE_FEED_IN_CHROME)
  #include "components/feed/core/common/pref_names.h"
  #endif  // BUILDFLAG(ENABLE_FEED_IN_CHROME)
-@@ -1015,6 +1016,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1014,6 +1015,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
    variations::VariationsService::RegisterProfilePrefs(registry);
    feed::prefs::RegisterFeedSharedProfilePrefs(registry);

build/patches/Disable-safe-browsing.patch

@@ -7,7 +7,7 @@ Contains Android-specific fixes to remove Safe Browsing
 Disable CrowdDeny feature
 ---
  .../res/xml/google_services_preferences.xml   | 20 ------
- .../java/res/xml/privacy_preferences.xml      |  5 --
+ .../java/res/xml/privacy_preferences.xml      | 11 ---
  .../res/xml/sync_and_services_preferences.xml | 20 ------
  .../privacy/settings/PrivacySettings.java     | 55 ++------------
  .../sync/settings/GoogleServicesSettings.java | 10 +--
@@ -71,7 +71,7 @@ Disable CrowdDeny feature
  .../native_file_system_file_writer_impl.cc    | 50 +------------
  .../native_file_system_file_writer_impl.h     | 14 +---
  .../native_file_system_permission_context.h   |  6 --
- 65 files changed, 183 insertions(+), 665 deletions(-)
+ 65 files changed, 183 insertions(+), 671 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
 --- a/chrome/android/java/res/xml/google_services_preferences.xml
@@ -122,6 +122,19 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
      <Preference
          android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings"
          android:key="do_not_track"
+@@ -39,12 +34,6 @@
+         android:summary="@string/clear_browsing_data_summary"
+         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment"
+         android:order="5"/>
+-    <Preference
+-        android:key="safe_browsing"
+-        android:title="@string/prefs_safe_browsing_title"
+-        android:summary="@string/prefs_safe_browsing_summary"
+-        android:fragment="org.chromium.chrome.browser.safe_browsing.settings.SecuritySettingsFragment"
+-        android:order="6"/>
+     <org.chromium.components.browser_ui.settings.TextMessagePreference
+         android:key="sync_and_services_link"
+         android:summary="@string/privacy_sync_and_services_link"
 diff --git a/chrome/android/java/res/xml/sync_and_services_preferences.xml b/chrome/android/java/res/xml/sync_and_services_preferences.xml
 --- a/chrome/android/java/res/xml/sync_and_services_preferences.xml
 +++ b/chrome/android/java/res/xml/sync_and_services_preferences.xml

build/patches/Disable-sync-services-menu-entry.patch

@@ -28,10 +28,10 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -40,9 +40,4 @@
-         android:summary="@string/prefs_safe_browsing_summary"
-         android:fragment="org.chromium.chrome.browser.safe_browsing.settings.SecuritySettingsFragment"
-         android:order="6"/>
+@@ -34,9 +34,4 @@
+         android:summary="@string/clear_browsing_data_summary"
+         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment"
+         android:order="5"/>
 -    <org.chromium.components.browser_ui.settings.TextMessagePreference
 -        android:key="sync_and_services_link"
 -        android:summary="@string/privacy_sync_and_services_link"

build/patches/Enable-DoH.patch

@@ -3,10 +3,46 @@ Date: Sat, 26 Sep 2020 14:23:19 +0100
 Subject: Enable DoH
 
 ---
- .../chrome/browser/privacy/secure_dns/SecureDnsBridge.java  | 2 +-
- chrome/common/chrome_features.cc                            | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ .../browser/net/stub_resolver_config_reader.cc  | 17 +----------------
+ .../privacy/secure_dns/SecureDnsBridge.java     |  2 +-
+ chrome/common/chrome_features.cc                |  4 ++--
+ 3 files changed, 4 insertions(+), 19 deletions(-)
 
+diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc
+--- a/chrome/browser/net/stub_resolver_config_reader.cc
++++ b/chrome/browser/net/stub_resolver_config_reader.cc
+@@ -153,7 +153,7 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state,
+       if (entries.count("dns-over-https@1")) {
+         // The user has "Enabled" selected.
+         local_state_->SetString(prefs::kDnsOverHttpsMode,
+-                                SecureDnsConfig::kModeAutomatic);
++                                SecureDnsConfig::kModeSecure);
+       } else if (entries.count("dns-over-https@2")) {
+         // The user has "Disabled" selected.
+         local_state_->SetString(prefs::kDnsOverHttpsMode,
+@@ -327,22 +327,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration(
+     check_parental_controls = false;
+   }
+ 
+-  // Check parental controls last because it can be expensive and should only be
+-  // checked if necessary for the otherwise-determined mode.
+   if (check_parental_controls) {
+-    if (ShouldDisableDohForParentalControls()) {
+-      forced_management_mode =
+-          SecureDnsConfig::ManagementMode::kDisabledParentalControls;
+-      secure_dns_mode = net::DnsConfig::SecureDnsMode::OFF;
+-      mode_details =
+-          SecureDnsModeDetailsForHistogram::kOffByDetectedParentalControls;
+-
+-      // If parental controls had not previously been checked, need to update
+-      // network service.
+-      if (!parental_controls_checked_)
+-        update_network_service = true;
+-    }
+-
+     parental_controls_checked_ = true;
+   }
+ 
 diff --git a/chrome/browser/privacy/java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java b/chrome/browser/privacy/java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java
 --- a/chrome/browser/privacy/java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java
 +++ b/chrome/browser/privacy/java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java
@@ -31,12 +67,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
  
  // Provides a mechanism to remove providers from the dropdown list in the
  // settings UI. Separate multiple provider ids with commas. See the
-@@ -274,11 +274,11 @@ const base::FeatureParam<std::string> kDnsOverHttpsDisabledProvidersParam{
- // Set whether fallback to insecure DNS is allowed by default. This setting may
- // be overridden for individual transactions.
- const base::FeatureParam<bool> kDnsOverHttpsFallbackParam{&kDnsOverHttps,
--                                                          "Fallback", true};
-+                                                          "Fallback", false};
+@@ -278,7 +278,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackParam{&kDnsOverHttps,
  
  // Sets whether the DoH setting is displayed in the settings UI.
  const base::FeatureParam<bool> kDnsOverHttpsShowUiParam{&kDnsOverHttps,