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

Commit 49bffacf authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

[Auto] Update e patches

parent 7a79b53f
Loading
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
From c96b4063b13a9a1d38c0063a6250fea145d8db7b Mon Sep 17 00:00:00 2001
From 62f42af4f28cead3d8e5bd75baa5bf5e138e40ce Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 08:03:13 +0000
Subject: Browser: Add provider to share default search engine
@@ -12,10 +12,10 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java

diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 46ddd924dae7e..e9f1ce7e50ed9 100644
index 6c9e92f1e8df9..d24ed2472d393 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1326,6 +1326,12 @@ by a child template that "extends" this file.
@@ -1345,6 +1345,12 @@ by a child template that "extends" this file.
           tools:ignore="ExportedContentProvider">
       </provider>
 
@@ -123,5 +123,5 @@ index 9c175c0d24804..eccb0847f7cd6 100644
 chrome_java_sources += userscripts_java_sources
+chrome_java_sources += [ "java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java" ]
-- 
2.48.1
2.49.0
+7 −7
Original line number Diff line number Diff line
From af82ab8ef3220845d46d1f926ad6c7bea44156ef Mon Sep 17 00:00:00 2001
From 333b1b16ad9cbe8a48d4cad5de0f9cb6327e9340 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Tue, 10 Sep 2024 12:17:23 +0530
Subject: Browser: Change adblock url to ours
@@ -43,10 +43,10 @@ index ef6d1652c97f0..24cd56084827d 100644
         mAdBlockFiltersUrlEdit.setText(AdBlockNativeGateway.getAdBlockFiltersURL());
         mAdBlockFiltersUrlEdit.addTextChangedListener(this);
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 49e287fc930ec..5f6707c2278b5 100644
index 6a34a89f0f2a2..b0bb42b590a6f 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1247,11 +1247,11 @@ BrowserProcessImpl::adblock_updater() {
@@ -1282,11 +1282,11 @@ BrowserProcessImpl::adblock_updater() {
   std::unique_ptr<component_updater::UpdateScheduler> scheduler =
       std::make_unique<component_updater::TimerUpdateScheduler>();
 
@@ -63,7 +63,7 @@ index 49e287fc930ec..5f6707c2278b5 100644
   }
 
   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(
@@ -1259,7 +1259,7 @@ BrowserProcessImpl::adblock_updater() {
@@ -1294,7 +1294,7 @@ BrowserProcessImpl::adblock_updater() {
           std::move(scheduler),
           g_browser_process->subresource_filter_ruleset_service(),
           local_state()->GetBoolean(prefs::kAdBlockEnabled),
@@ -73,10 +73,10 @@ index 49e287fc930ec..5f6707c2278b5 100644
   return adblock_updater_.get();
 }
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
index 32f549a54cd00..70057afef3ab3 100644
index 48cfc3c14d972..f100d99a6b90d 100644
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -644,7 +644,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -658,7 +658,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
 
   registry->RegisterBooleanPref(prefs::kAdBlockEnabled, false);
   registry->RegisterStringPref(prefs::kAdBlockFiltersURL,
@@ -86,5 +86,5 @@ index 32f549a54cd00..70057afef3ab3 100644
   // Static auth params
   registry->RegisterStringPref(prefs::kAuthSchemes,
-- 
2.34.1
2.49.0
Loading