Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c13ac2e3 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

parents f0525370 511801eb

services/core/java/com/android/server/content/SyncManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2853,9 +2853,9 @@ public class SyncManager { 
                }

                return SYNC_OP_STATE_INVALID_NO_ACCOUNT_ACCESS;

            }

            if (state != AuthorityInfo.SYNCABLE) {

            if (state == AuthorityInfo.NOT_SYNCABLE) {

                if (isLoggable) {

                    Slog.v(TAG, "    Dropping sync operation: isSyncable != SYNCABLE");

                    Slog.v(TAG, "    Dropping sync operation: isSyncable == NOT_SYNCABLE");

                }

                return SYNC_OP_STATE_INVALID;

            }