Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Unified Diff: sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java

Issue 1075343003: Ensure that isSyncable is set when Chrome sync is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2357
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java
diff --git a/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java b/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java
index d24366c76a0486f9e61228bfc971a0a9c9766cf4..ccdee86ca3dff3a33737e28d06e32ddea2490476 100644
--- a/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java
+++ b/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java
@@ -193,8 +193,9 @@ public class AndroidSyncSettings {
private void setChromeSyncEnabled(boolean value) {
synchronized (mLock) {
- if (value == mChromeSyncEnabled || mAccount == null) return;
+ if (mAccount == null) return;
ensureSyncable();
+ if (value == mChromeSyncEnabled) return;
mChromeSyncEnabled = value;
StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
« no previous file with comments | « no previous file | sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698