Artem Samoilenko
75c7656d70
This is to fix the following error:
../../chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java:727: warning: [NullAway] passing @Nullable parameter 'signedInAccountName' where @NonNull is required
this, () -> onGoogleActivityControlsClicked(signedInAccountName)));
22 lines
1.6 KiB
Diff
22 lines
1.6 KiB
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 c0ca31f069bbcba7b28a3b32b97d28b1fb6bc367..68efdd1f4c5fcc03e478c2b52f855539fe986547 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
|
|
@@ -67,7 +67,7 @@ import org.chromium.chrome.browser.ui.signin.SignOutCoordinator;
|
|
import org.chromium.chrome.browser.ui.signin.SigninUtils;
|
|
import org.chromium.chrome.browser.ui.signin.SignoutButtonPreference;
|
|
import org.chromium.chrome.browser.ui.signin.history_sync.HistorySyncHelper;
|
|
-import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference;
|
|
+import org.chromium.components.browser_ui.settings.brave_tricks.checkbox_to_switch.ChromeBaseCheckBoxPreference;
|
|
import org.chromium.components.browser_ui.settings.ChromeBasePreference;
|
|
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
|
|
import org.chromium.components.browser_ui.settings.SettingsUtils;
|
|
@@ -710,6 +710,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(
|