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

Commit ade9916d authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 6421ae7e to master 

Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
parents f86369ad 6421ae7e

core/java/android/content/SyncManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1714,7 +1714,6 @@ public class SyncManager implements OnAccountsUpdateListener { 
                Log.v(TAG, "runStateIdle: setting mActiveSyncContext to " + mActiveSyncContext);

            }

            mSyncStorageEngine.setActiveSync(mActiveSyncContext);

            mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));

            if (!activeSyncContext.bindToSyncAdapter(syncAdapterInfo)) {

                Log.e(TAG, "Bind attempt failed to " + syncAdapterInfo);

                mActiveSyncContext.close();
@@ -1737,6 +1736,7 @@ public class SyncManager implements OnAccountsUpdateListener { 
            PowerManager.WakeLock oldWakeLock = mSyncWakeLock;

            try {

                mSyncWakeLock = getSyncWakeLock(op.account.type, op.authority);

				mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));

                mSyncWakeLock.acquire();

            } finally {

                if (oldWakeLock != null && oldWakeLock != mSyncWakeLock) {