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

Commit f5aa3945 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

add back more patches

parent e4f0cc23

build/patches/0001-Disable-tab-groups-flags.patch

0 → 100644
+44 −0
Original line number Diff line number Diff line 
From 4abb3962bbfe53e6b85c76a2fd01f50b07fa46d9 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Mon, 17 May 2021 22:32:36 +0200

Subject: [PATCH 1/6] Disable tab groups flags



Disabled by default



License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 chrome/browser/flags/android/chrome_feature_list.cc           | 4 ++--

 .../org/chromium/chrome/browser/flags/ChromeFeatureList.java  | 2 +-

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



diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

index 40179a04fa4b2..83eee07041b81 100644

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -1029,8 +1029,8 @@ BASE_FEATURE(kTabEngagementReportingAndroid,

 // groups are currently unsupported (low-end devices and users of the

 // accessibility tab switcher).

 BASE_FEATURE(kTabGroupsAndroid,

-             "TabGroupsAndroid",

-             base::FEATURE_ENABLED_BY_DEFAULT);

+             "TabGroupsAndroid",                   // disabled by default

+             base::FEATURE_DISABLED_BY_DEFAULT);   // in Bromite

 

 BASE_FEATURE(kTabGroupsContinuationAndroid,

              "TabGroupsContinuationAndroid",

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

index d623cd418e41b..b3a1321e39f31 100644

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -605,7 +605,7 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sTabGridLayoutAndroid = new CachedFlag(TAB_GRID_LAYOUT_ANDROID,

             ChromePreferenceKeys.FLAGS_CACHED_GRID_TAB_SWITCHER_ENABLED, true);

     public static final CachedFlag sTabGroupsAndroid = new CachedFlag(

-            TAB_GROUPS_ANDROID, ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED, true);

+            TAB_GROUPS_ANDROID, ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED, false);

     public static final CachedFlag sTabGroupsContinuationAndroid =

             new CachedFlag(TAB_GROUPS_CONTINUATION_ANDROID, false);

     public static final CachedFlag sTabGroupsForTablets =

-- 

2.34.1

build/patches/0002-Disable-AGSA-by-default.patch

0 → 100644
+304 −0
Original line number Diff line number Diff line 
From 05dfe085d48e044971ec6ed108b23d0b035d3c79 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Sun, 26 Sep 2021 11:17:53 +0200

Subject: [PATCH 2/6] Disable AGSA by default



License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 chrome/android/BUILD.gn                       |  2 --

 .../org/chromium/chrome/browser/AppHooks.java |  1 -

 .../chrome/browser/IntentHandler.java         |  5 ----

 .../chrome/browser/app/ChromeActivity.java    | 27 -------------------

 .../ChromeContextMenuPopulator.java           |  7 -----

 ...stomTabActivityClientConnectionKeeper.java |  9 -------

 .../init/ProcessInitializationHandler.java    |  8 ------

 .../chrome/browser/share/LensUtils.java       | 17 ++----------

 .../flags/android/chrome_feature_list.cc      |  4 +--

 .../browser/flags/ChromeFeatureList.java      |  2 +-

 chrome/browser/ui/android/omnibox/BUILD.gn    |  2 --

 11 files changed, 5 insertions(+), 79 deletions(-)



diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index da9aea7165667..50b8c6a78fc46 100644

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -938,7 +938,6 @@ if (current_toolchain == default_toolchain) {

       "//chrome/browser/flags:flags_junit_tests",

       "//chrome/browser/flags:java",

       "//chrome/browser/fullscreen/android:java",

-      "//chrome/browser/gsa:java",

       "//chrome/browser/history_clusters:java",

       "//chrome/browser/image_descriptions:java",

       "//chrome/browser/image_editor/public:java",

@@ -1510,7 +1509,6 @@ if (current_toolchain == default_toolchain) {

       "//chrome/browser/first_run/android:java",

       "//chrome/browser/flags:java",

       "//chrome/browser/fullscreen/android:java",

-      "//chrome/browser/gsa:java",

       "//chrome/browser/history_clusters:java",

       "//chrome/browser/image_descriptions:javatests",

       "//chrome/browser/incognito:incognito_java_tests",

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java

index 3f1ef3b2518ca..2a8939cdbc36f 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java

@@ -12,7 +12,6 @@ import org.chromium.base.PackageUtils;

 import org.chromium.chrome.browser.customtabs.CustomTabsConnection;

 import org.chromium.chrome.browser.directactions.DirectActionCoordinator;

 import org.chromium.chrome.browser.feedback.FeedbackReporter;

-import org.chromium.chrome.browser.gsa.GSAHelper;

 import org.chromium.chrome.browser.historyreport.AppIndexingReporter;

 import org.chromium.chrome.browser.init.ChromeStartupDelegate;

 import org.chromium.chrome.browser.init.ProcessInitializationHandler;

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java

index d908409112f94..c7955f6cda530 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java

@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;

 import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler;

 import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata;

 import org.chromium.chrome.browser.flags.ChromeFeatureList;

-import org.chromium.chrome.browser.gsa.GSAState;

 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;

 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteControllerProvider;

 import org.chromium.chrome.browser.profiles.Profile;

@@ -265,8 +264,6 @@ public class IntentHandler {

     private static int sReferrerId;

     private static String sPendingIncognitoUrl;

 

-    public static final String PACKAGE_GSA = GSAState.PACKAGE_NAME;

-

     private static final String PACKAGE_GMAIL = "com.google.android.gm";

     private static final String PACKAGE_PLUS = "com.google.android.apps.plus";

     private static final String PACKAGE_HANGOUTS = "com.google.android.talk";

@@ -498,8 +495,6 @@ public class IntentHandler {

             return ExternalAppId.LINE;

         } else if (packageName.equals(PACKAGE_WHATSAPP)) {

             return ExternalAppId.WHATSAPP;

-        } else if (packageName.equals(PACKAGE_GSA)) {

-            return ExternalAppId.GSA;

         } else if (packageName.equals(ContextUtils.getApplicationContext().getPackageName())) {

             return ExternalAppId.CHROME;

         } else if (packageName.startsWith(WEBAPK_PACKAGE_PREFIX)) {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

index a4df8fd41de18..e721b4ef2cdf0 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -116,10 +116,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;

 import org.chromium.chrome.browser.fullscreen.BrowserControlsManagerSupplier;

 import org.chromium.chrome.browser.fullscreen.FullscreenBackPressHandler;

 import org.chromium.chrome.browser.fullscreen.FullscreenManager;

-import org.chromium.chrome.browser.gsa.ContextReporter;

-import org.chromium.chrome.browser.gsa.GSAAccountChangeListener;

-import org.chromium.chrome.browser.gsa.GSAContextDisplaySelection;

-import org.chromium.chrome.browser.gsa.GSAState;

 import org.chromium.chrome.browser.history.HistoryManagerUtils;

 import org.chromium.chrome.browser.init.AsyncInitializationActivity;

 import org.chromium.chrome.browser.init.ProcessInitializationHandler;

@@ -391,8 +387,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

 

     private LaunchCauseMetrics mLaunchCauseMetrics;

 

-    private GSAAccountChangeListener mGSAAccountChangeListener;

-

     // TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity.

     private List<MenuOrKeyboardActionController.MenuOrKeyboardActionHandler> mMenuActionHandlers =

             new ArrayList<>();

@@ -1256,9 +1250,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

 

     @Override

     public void onStopWithNative() {

-        if (GSAState.getInstance().isGsaAvailable() && !SysUtils.isLowEndDevice()) {

-            if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect();

-        }

         if (mSyncStateChangedListener != null) {

             SyncService syncService = getSyncServiceForOriginalProfile();

             if (syncService != null) {

@@ -1352,24 +1343,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

             ForcedSigninProcessor.checkCanSignIn(ChromeActivity.this);

         });

 

-        // GSA connection is not needed on low-end devices because Icing is disabled.

-        if (!SysUtils.isLowEndDevice()) {

-            DeferredStartupHandler.getInstance().addDeferredTask(() -> {

-                if (isActivityFinishingOrDestroyed()) return;

-                if (!GSAState.getInstance().isGsaAvailable()) {

-                    ContextReporter.reportStatus(ContextReporter.STATUS_GSA_NOT_AVAILABLE);

-                    return;

-                }

-

-                if (mGSAAccountChangeListener == null) {

-                    mGSAAccountChangeListener =

-                            GSAAccountChangeListener.create(AppHooks.get().createGsaHelper());

-                }

-                mGSAAccountChangeListener.connect();

-                createContextReporterIfNeeded();

-            });

-        }

-

         DeferredStartupHandler.getInstance().addDeferredTask(

                 () -> { MemoryPurgeManager.getInstance().start(); });

     }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

index 38b19e0cd8f0e..3f48d1d43407b 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

@@ -35,7 +35,6 @@ import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemTy

 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;

 import org.chromium.chrome.browser.firstrun.FirstRunStatus;

 import org.chromium.chrome.browser.flags.ChromeFeatureList;

-import org.chromium.chrome.browser.gsa.GSAState;

 import org.chromium.chrome.browser.lens.LensController;

 import org.chromium.chrome.browser.lens.LensEntryPoint;

 import org.chromium.chrome.browser.lens.LensIntentParams;

@@ -828,12 +827,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

                     LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE);

             return false;

         }

-        if (GSAState.getInstance().isAgsaVersionBelowMinimum(

-                    versionName, LensUtils.getMinimumAgsaVersionForLensSupport())) {

-            LensMetrics.recordLensSupportStatus(

-                    LENS_SUPPORT_STATUS_HISTOGRAM_NAME, LensMetrics.LensSupportStatus.OUT_OF_DATE);

-            return false;

-        }

 

         if (LensUtils.isDeviceOsBelowMinimum()) {

             LensMetrics.recordLensSupportStatus(

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java

index 8c222555b292c..8eb7340f20761 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java

@@ -11,7 +11,6 @@ import org.chromium.base.metrics.RecordHistogram;

 import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntentDataProvider;

 import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;

 import org.chromium.chrome.browser.dependency_injection.ActivityScope;

-import org.chromium.chrome.browser.gsa.GSAState;

 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;

 import org.chromium.chrome.browser.lifecycle.StartStopWithNativeObserver;

 import org.chromium.chrome.browser.tab.Tab;

@@ -95,13 +94,5 @@ public class CustomTabActivityClientConnectionKeeper implements StartStopWithNat

             }

         }

         assert status >= 0;

-

-        if (GSAState.isGsaPackageName(packageName)) {

-            RecordHistogram.recordEnumeratedHistogram("CustomTabs.ConnectionStatusOnReturn.GSA",

-                    status, ConnectionStatus.NUM_ENTRIES);

-        } else {

-            RecordHistogram.recordEnumeratedHistogram("CustomTabs.ConnectionStatusOnReturn.NonGSA",

-                    status, ConnectionStatus.NUM_ENTRIES);

-        }

     }

 }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

index e59a3c5abdd3a..3add608e2381e 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

@@ -370,14 +370,6 @@ public class ProcessInitializationHandler {

             }

         });

 

-        deferredStartupHandler.addDeferredTask(new Runnable() {

-            @Override

-            public void run() {

-                // Starts syncing with GSA.

-                AppHooks.get().createGsaHelper().startSync();

-            }

-        });

-

         deferredStartupHandler.addDeferredTask(new Runnable() {

             @Override

             public void run() {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java

index 76ff2edd09e97..7ccce913290dc 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java

@@ -11,7 +11,6 @@ import android.text.TextUtils;

 import org.chromium.chrome.R;

 import org.chromium.chrome.browser.IntentHandler;

 import org.chromium.chrome.browser.flags.ChromeFeatureList;

-import org.chromium.chrome.browser.gsa.GSAState;

 import org.chromium.components.externalauth.ExternalAuthUtils;

 

 /**

@@ -59,15 +58,7 @@ public class LensUtils {

         if (sFakePassableLensEnvironmentForTesting) {

             return MIN_AGSA_VERSION_NAME_FOR_LENS_POSTCAPTURE;

         } else {

-            if (context == null) {

-                return "";

-            }

-            String agsaVersion = GSAState.getInstance().getAgsaVersionName();

-            if (agsaVersion == null) {

-                return "";

-            } else {

-                return agsaVersion;

-            }

+            return "";

         }

     }

 

@@ -119,11 +110,7 @@ public class LensUtils {

      * @return Whether the package is valid.

      */

     public static boolean isValidAgsaPackage(final ExternalAuthUtils externalAuthUtils) {

-        if (sFakePassableLensEnvironmentForTesting) {

-            return true;

-        }

-

-        return externalAuthUtils.isGoogleSigned(IntentHandler.PACKAGE_GSA);

+        return false;

     }

 

     public static boolean isGoogleLensFeatureEnabled(boolean isIncognito) {

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

index 83eee07041b81..57006a283e94d 100644

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -752,8 +752,8 @@ BASE_FEATURE(kOfflineIndicatorV2,

              base::FEATURE_ENABLED_BY_DEFAULT);

 

 BASE_FEATURE(kExperimentsForAgsa,

-             "ExperimentsForAgsa",

-             base::FEATURE_ENABLED_BY_DEFAULT);

+             "ExperimentsForAgsa",                 // disabled by default

+             base::FEATURE_DISABLED_BY_DEFAULT);   // in Bromite

 

 BASE_FEATURE(kExploreSites, "ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT);

 

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

index b3a1321e39f31..cff5d0898e73e 100644

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -555,7 +555,7 @@ public abstract class ChromeFeatureList {

             new CachedFlag(DELAY_TEMP_STRIP_REMOVAL, true);

     public static final CachedFlag sDiscoverMultiColumn = new CachedFlag(FEED_MULTI_COLUMN, true);

     public static final CachedFlag sEarlyLibraryLoad = new CachedFlag(EARLY_LIBRARY_LOAD, true);

-    public static final CachedFlag sExperimentsForAgsa = new CachedFlag(EXPERIMENTS_FOR_AGSA, true);

+    public static final CachedFlag sExperimentsForAgsa = new CachedFlag(EXPERIMENTS_FOR_AGSA, false);

     public static final CachedFlag sFeedLoadingPlaceholder =

             new CachedFlag(FEED_LOADING_PLACEHOLDER, false);

     public static final CachedFlag sFoldableJankFix = new CachedFlag(FOLDABLE_JANK_FIX, true);

diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn

index 475e56317de68..203df3cb7fba7 100644

--- a/chrome/browser/ui/android/omnibox/BUILD.gn

+++ b/chrome/browser/ui/android/omnibox/BUILD.gn

@@ -156,7 +156,6 @@ android_library("java") {

     "//chrome/browser/device:java",

     "//chrome/browser/feature_engagement:java",

     "//chrome/browser/flags:java",

-    "//chrome/browser/gsa:java",

     "//chrome/browser/history_clusters:java",

     "//chrome/browser/language/android:java",

     "//chrome/browser/lens:java",

@@ -469,7 +468,6 @@ robolectric_library("junit") {

     "//chrome/browser/commerce/merchant_viewer/android:java",

     "//chrome/browser/device:java",

     "//chrome/browser/flags:java",

-    "//chrome/browser/gsa:java",

     "//chrome/browser/lens:java",

     "//chrome/browser/locale:java",

     "//chrome/browser/preferences:java",

-- 

2.34.1

build/patches/0003-Update-i18n-zh_CN-support.patch

0 → 100644
+211 −0

File added.

Preview size limit exceeded, changes collapsed.

build/patches/0004-Remove-mremap-from-seccomp-baseline-policy.patch

0 → 100644
+29 −0
Original line number Diff line number Diff line 
From 1b552eedf55eef6e16266e8f2ae0b05867a7a176 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Sat, 16 Apr 2022 10:14:28 +0200

Subject: [PATCH 4/6] Remove mremap from seccomp baseline policy



See also:

* https://bugs.chromium.org/p/chromium/issues/detail?id=1288042

* https://docs.hexavalent.org/sandboxing/mremap.html



License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc | 1 -

 1 file changed, 1 deletion(-)



diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc

index 14acc6956310f..e8cb6af831391 100644

--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc

+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc

@@ -166,7 +166,6 @@ ResultExpr BaselinePolicyAndroid::EvaluateSyscall(int sysno) const {

     case __NR_getdents64:

     case __NR_getpriority:

     case __NR_membarrier:  // https://crbug.com/966433

-    case __NR_mremap:

 #if defined(__i386__)

     // Used on pre-N to initialize threads in ART.

     case __NR_modify_ldt:

-- 

2.34.1

build/patches/0005-Re-introduce-kWebAuthCable.patch

0 → 100644
+260 −0

File added.

Preview size limit exceeded, changes collapsed.