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

Unverified Commit 2daf5c97 authored by uazo's avatar uazo Committed by GitHub
Browse files

[AUTO] Patches auto-rebase for master branch (#1560) 

[AUTO] Patches auto-rebase for master branch
parents bc260d49 ca7e02c5

build/patches/Add-flag-to-disable-external-intent-requests.patch

+3 −3
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component 
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java

--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java

+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java

@@ -1521,6 +1521,12 @@ public class ExternalNavigationHandler {

@@ -1532,6 +1532,12 @@ public class ExternalNavigationHandler {

                 || ignoreBackForwardNav(params);

     }
@@ -186,7 +186,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component 
     private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(

             ExternalNavigationParams params,

             Intent targetIntent,

@@ -1583,6 +1589,21 @@ public class ExternalNavigationHandler {

@@ -1594,6 +1600,21 @@ public class ExternalNavigationHandler {

             return OverrideUrlLoadingResult.forNoOverride();

         }
@@ -207,7 +207,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component 
+

         if (hasInternalScheme(params.getUrl(), targetIntent)

                 || hasContentScheme(params.getUrl(), targetIntent)

                 || hasFileSchemeInIntentURI(params.getUrl(), targetIntent)) {

                 || hasFileSchemeInIntentURI(params.getUrl(), targetIntent)

diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc

new file mode 100644

--- /dev/null

build/patches/Remove-binary-blob-integrations.patch

+1 −1
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn 
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java

--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java

+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java

@@ -2560,14 +2560,6 @@ public class ExternalNavigationHandler {

@@ -2572,14 +2572,6 @@ public class ExternalNavigationHandler {

      * @return Whether the given intent is going to open an Instant App.

      */

     private static boolean isIntentToInstantApp(Intent intent) {