From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 26 Sep 2021 11:17:53 +0200 Subject: Disable AGSA by default License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/android/BUILD.gn | 3 --- .../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 ------ .../browser/ntp/search/SearchBoxMediator.java | 1 - .../chrome/browser/share/LensUtils.java | 12 +-------- .../flags/android/chrome_feature_list.cc | 2 +- .../browser/flags/CachedFeatureFlags.java | 2 +- chrome/browser/ui/android/omnibox/BUILD.gn | 2 -- .../browser/omnibox/LocationBarMediator.java | 1 - 13 files changed, 3 insertions(+), 77 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -379,7 +379,6 @@ android_library("chrome_java") { "//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/history_clusters:java_resources", "//chrome/browser/image_descriptions:java", @@ -1010,7 +1009,6 @@ robolectric_binary("chrome_junit_tests") { "//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", @@ -1529,7 +1527,6 @@ android_library("chrome_test_java") { "//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 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java @@ -17,7 +17,6 @@ import org.chromium.chrome.browser.directactions.DirectActionCoordinator; import org.chromium.chrome.browser.feedback.FeedbackReporter; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl; -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 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java @@ -42,7 +42,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabsConnection; 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.gsa.GSAState; import org.chromium.chrome.browser.offlinepages.OfflinePageUtils; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; import org.chromium.chrome.browser.profiles.Profile; @@ -255,8 +254,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"; @@ -486,8 +483,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 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java @@ -111,10 +111,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; @@ -371,8 +367,6 @@ public abstract class ChromeActivity private LaunchCauseMetrics mLaunchCauseMetrics; - private GSAAccountChangeListener mGSAAccountChangeListener; - // TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity. private List mMenuActionHandlers = new ArrayList<>(); @@ -1166,10 +1160,6 @@ public abstract class ChromeActivity @Override public void onStopWithNative() { - if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) { - if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect(); - } - super.onStopWithNative(); } @@ -1260,23 +1250,6 @@ public abstract class ChromeActivity FontSizePrefs.getInstance(Profile.getLastUsedRegularProfile()) .recordUserFontPrefOnStartup(); }); - - // GSA connection is not needed on low-end devices because Icing is disabled. - if (!SysUtils.isLowEndDevice()) { - if (isActivityFinishingOrDestroyed()) return; - DeferredStartupHandler.getInstance().addDeferredTask(() -> { - if (!GSAState.getInstance(this).isGsaAvailable()) { - ContextReporter.reportStatus(ContextReporter.STATUS_GSA_NOT_AVAILABLE); - return; - } - - if (mGSAAccountChangeListener == null) { - mGSAAccountChangeListener = - GSAAccountChangeListener.create(AppHooks.get().createGsaHelper()); - } - mGSAAccountChangeListener.connect(); - }); - } } /** 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java @@ -37,7 +37,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; @@ -997,12 +996,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE); return false; } - if (GSAState.getInstance(mContext).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 --- 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java @@ -358,14 +358,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/ntp/search/SearchBoxMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java @@ -13,7 +13,6 @@ import android.view.ViewGroup; import androidx.core.graphics.drawable.RoundedBitmapDrawable; -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; 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.flags.ChromeFeatureList; -import org.chromium.chrome.browser.gsa.GSAState; import org.chromium.chrome.browser.lens.LensController; import org.chromium.components.externalauth.ExternalAuthUtils; @@ -57,12 +56,7 @@ public class LensUtils { if (context == null) { return ""; } - String agsaVersion = GSAState.getInstance(context).getAgsaVersionName(); - if (agsaVersion == null) { return ""; - } else { - return agsaVersion; - } } } @@ -114,11 +108,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; } /** diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -691,7 +691,7 @@ const base::Feature kDuetTabStripIntegrationAndroid{ "DuetTabStripIntegrationAndroid", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kExperimentsForAgsa{"ExperimentsForAgsa", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kExploreSites{"ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java @@ -71,7 +71,7 @@ public class CachedFeatureFlags { .put(ChromeFeatureList.EARLY_LIBRARY_LOAD, true) .put(ChromeFeatureList.ELASTIC_OVERSCROLL, true) .put(ChromeFeatureList.ELIDE_PRIORITIZATION_OF_PRE_NATIVE_BOOTSTRAP_TASKS, true) - .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, true) + .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, false) .put(ChromeFeatureList.FEED_LOADING_PLACEHOLDER, false) .put(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS, false) .put(ChromeFeatureList.IMMERSIVE_UI_MODE, false) diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn --- a/chrome/browser/ui/android/omnibox/BUILD.gn +++ b/chrome/browser/ui/android/omnibox/BUILD.gn @@ -142,7 +142,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", @@ -428,7 +427,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", diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java @@ -38,7 +38,6 @@ import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.device.DeviceClassManager; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; -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; -- 2.25.1