Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02abc717 authored by csagan5's avatar csagan5
Browse files

Updating patches for next 88.0.4324.141 release

parent 344da255

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
* re-introduce flags for number of raster threads (fixes https://github.com/bromite/bromite/issues/875)

* avoid initializing histogram data for the WebView (https://github.com/bromite/bromite/issues/873)

* dropped patch for manifest changes for Q/R (already present upstream)

* fix check for HTML extension in bookmark import dialog



# 87.0.4280.131

* enable all network isolation features (fixes https://github.com/bromite/bromite/issues/836)

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
88.0.4324.95
 
88.0.4324.141

build/patches/Add-bookmark-import-export-actions.patch

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm 
     /**

      * Synchronously gets a list of bookmarks that match the specified search query.

      * @param query Keyword used for searching bookmarks.

@@ -1005,6 +1032,24 @@ public class BookmarkBridge {

@@ -1006,6 +1033,24 @@ public class BookmarkBridge {

         depthList.add(depth);

     }
@@ -232,7 +232,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm 
     private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {

         List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();

         for (int i = 0; i < left.length; i++) {

@@ -1072,6 +1117,8 @@ public class BookmarkBridge {

@@ -1073,6 +1118,8 @@ public class BookmarkBridge {

         int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type);

         void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type,

                 List<BookmarkId> bookmarksList);

build/patches/Ignore-managed-state-for-secure-DNS.patch

+15 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ Subject: Ignore managed state for secure DNS 


---

 chrome/browser/net/stub_resolver_config_reader.cc | 3 +--

 chrome/browser/privacy/secure_dns_bridge.cc       | 3 +--

 2 files changed, 2 insertions(+), 4 deletions(-)

 chrome/browser/privacy/secure_dns_bridge.cc       | 9 ++-------

 2 files changed, 3 insertions(+), 9 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
@@ -33,6 +33,19 @@ diff --git a/chrome/browser/privacy/secure_dns_bridge.cc b/chrome/browser/privac 
 }

 

 static ScopedJavaLocalRef<jobjectArray> JNI_SecureDnsBridge_GetProviders(

@@ -131,11 +130,7 @@ static jboolean JNI_SecureDnsBridge_SetTemplates(

 }

 

 static jint JNI_SecureDnsBridge_GetManagementMode(JNIEnv* env) {

-  return static_cast<int>(

-      SystemNetworkContextManager::GetStubResolverConfigReader()

-          ->GetSecureDnsConfiguration(

-              true /* force_check_parental_controls_for_automatic_mode */)

-          .management_mode());

+  return static_cast<int>(ManagementMode::kNoOverride);

 }

 

 static void JNI_SecureDnsBridge_UpdateDropdownHistograms(

-- 

2.17.1