Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a regression in sync manager am: dfed1c73ec am: a09f3790ac" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-08-26 01:09:42 +00:00
committed by Android (Google) Code Review
parent f05253700a 511801eb0f
commit c13ac2e388
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/content/SyncManager.java
View File

@@ -2853,9 +2853,9 @@ public class SyncManager {
} }
return SYNC_OP_STATE_INVALID_NO_ACCOUNT_ACCESS; return SYNC_OP_STATE_INVALID_NO_ACCOUNT_ACCESS;
} }
if (state != AuthorityInfo.SYNCABLE) { if (state == AuthorityInfo.NOT_SYNCABLE) {
if (isLoggable) { if (isLoggable) {
Slog.v(TAG, " Dropping sync operation: isSyncable != SYNCABLE"); Slog.v(TAG, " Dropping sync operation: isSyncable == NOT_SYNCABLE");
} }
return SYNC_OP_STATE_INVALID; return SYNC_OP_STATE_INVALID;
} }