Claudio DeSouza
75e381f5a4
Chromium changes: https://chromium.googlesource.com/chromium/src/+/008e21eee2ca1b4d967a68367121423f6e411e2b commit 008e21eee2ca1b4d967a68367121423f6e411e2b Author: Victor Hugo Vianna Silva <victorvianna@google.com> Date: Mon Apr 20 04:59:40 2026 -0700 [sync/android] Remove sync-the-feature code in ManageSyncSettings kForceMigrateSyncingUserToSignedIn was enabled by default on Android in M148. OBSOLETE_HISTOGRAMS=The sync error card was removed, along with its histograms. Bug: 40066949 Change-Id: I8317957d3ad7cdeecaac415a11a2974af90d65d4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7772912 Reviewed-by: Ankush Singh <ankushkush@google.com> Reviewed-by: Marc Treib <treib@chromium.org> Commit-Queue: Victor Vianna <victorvianna@google.com> Auto-Submit: Victor Vianna <victorvianna@google.com> Cr-Commit-Position: refs/heads/main@{#1617409}
13 lines
988 B
Diff
13 lines
988 B
Diff
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
|
|
index d78125ef5e4c33f92a8d09670a18e618625ed27f..a953d52c2f9baa327854753d9eaf0bbc75fd955f 100644
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
|
|
@@ -460,6 +460,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
|
|
*/
|
|
private void updateSyncPreferences() {
|
|
String signedInAccountName =
|
|
+ mGoogleActivityControls != null ? "" : // We want the next `if` to be always false.
|
|
CoreAccountInfo.getEmailFrom(getIdentityManager().getPrimaryAccountInfo());
|
|
// May happen if account is removed from the device while this screen is shown.
|
|
if (signedInAccountName == null) {
|