| Index: sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
|
| diff --git a/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java b/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
|
| index 51783874537d470087722ed3074496e09b692e0f..a25a786b18f11c4762b23a85b050d175b01e5421 100644
|
| --- a/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
|
| +++ b/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
|
| @@ -279,8 +279,8 @@ public class SyncStatusHelper {
|
| if (account == null) return false;
|
| boolean returnValue;
|
| synchronized (mCachedSettings) {
|
| - returnValue = mCachedMasterSyncAutomatically &&
|
| - mCachedSettings.getSyncAutomatically(account);
|
| + returnValue = mCachedMasterSyncAutomatically
|
| + && mCachedSettings.getSyncAutomatically(account);
|
| }
|
|
|
| notifyObserversIfAccountSettingsChanged();
|
| @@ -374,11 +374,11 @@ public class SyncStatusHelper {
|
| // Disable the syncability of Chrome for all other accounts. Don't use
|
| // our cache as we're touching many accounts that aren't signed in, so this saves
|
| // extra calls to Android sync configuration.
|
| - Account[] googleAccounts = AccountManagerHelper.get(mApplicationContext).
|
| - getGoogleAccounts();
|
| + Account[] googleAccounts = AccountManagerHelper.get(mApplicationContext)
|
| + .getGoogleAccounts();
|
| for (Account accountToSetNotSyncable : googleAccounts) {
|
| - if (!accountToSetNotSyncable.equals(account) &&
|
| - mSyncContentResolverDelegate.getIsSyncable(
|
| + if (!accountToSetNotSyncable.equals(account)
|
| + && mSyncContentResolverDelegate.getIsSyncable(
|
| accountToSetNotSyncable, mContractAuthority) > 0) {
|
| mSyncContentResolverDelegate.setIsSyncable(accountToSetNotSyncable,
|
| mContractAuthority, 0);
|
|
|