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

Commit a706e2fd authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Lock SyncQueue when user starting, copy RSC list. 

Document SyncQueue locking policy and protect in onUserStarting()
and clearAllBackoffs().  Return copy of ServiceInfo list from
RegisteredServicesCache instead of exposing locking externally.

Bug: 7357776, 7352537
Change-Id: I6a32ca98a355b639d4207a88bde572179beae359
parent 4682cf02

core/java/android/content/SyncManager.java

+10 −7
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.accounts.AccountAndUser; 
import android.accounts.AccountManager;

import android.accounts.AccountManagerService;

import android.app.ActivityManager;

import android.app.ActivityManagerNative;

import android.app.AlarmManager;

import android.app.Notification;

import android.app.NotificationManager;
@@ -154,7 +153,9 @@ public class SyncManager { 
    private AlarmManager mAlarmService = null;



    private SyncStorageEngine mSyncStorageEngine;

    final public SyncQueue mSyncQueue;



    // @GuardedBy("mSyncQueue")

    private final SyncQueue mSyncQueue;



    protected final ArrayList<ActiveSyncContext> mActiveSyncContexts = Lists.newArrayList();
@@ -902,7 +903,9 @@ public class SyncManager { 


        updateRunningAccounts();



        synchronized (mSyncQueue) {

            mSyncQueue.addPendingOperations(userId);

        }



        // Schedule sync for any accounts under started user

        final Account[] accounts = AccountManagerService.getSingleton().getAccounts(userId);
@@ -1957,10 +1960,10 @@ public class SyncManager { 
            synchronized (mSyncQueue) {

                if (isLoggable) {

                    Log.v(TAG, "build the operation array, syncQueue size is "

                        + mSyncQueue.mOperationsMap.size());

                        + mSyncQueue.getOperations().size());

                }

                Iterator<SyncOperation> operationIterator =

                        mSyncQueue.mOperationsMap.values().iterator();

                final Iterator<SyncOperation> operationIterator = mSyncQueue.getOperations()

                        .iterator();



                final ActivityManager activityManager

                        = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);

core/java/android/content/SyncQueue.java

+8 −1
Original line number Diff line number Diff line
@@ -27,11 +27,14 @@ import android.util.Pair; 
import com.google.android.collect.Maps;



import java.util.ArrayList;

import java.util.Collection;

import java.util.HashMap;

import java.util.Iterator;

import java.util.Map;



/**

 * Queue of pending sync operations. Not inherently thread safe, external

 * callers are responsible for locking.

 *

 * @hide

 */
@@ -43,7 +46,7 @@ public class SyncQueue { 


    // A Map of SyncOperations operationKey -> SyncOperation that is designed for

    // quick lookup of an enqueued SyncOperation.

    public final HashMap<String, SyncOperation> mOperationsMap = Maps.newHashMap();

    private final HashMap<String, SyncOperation> mOperationsMap = Maps.newHashMap();



    public SyncQueue(SyncStorageEngine syncStorageEngine, final SyncAdaptersCache syncAdapters) {

        mSyncStorageEngine = syncStorageEngine;
@@ -198,6 +201,10 @@ public class SyncQueue { 
        }

    }



    public Collection<SyncOperation> getOperations() {

        return mOperationsMap.values();

    }



    public void dump(StringBuilder sb) {

        final long now = SystemClock.elapsedRealtime();

        sb.append("SyncQueue: ").append(mOperationsMap.size()).append(" operation(s)\n");

core/java/android/content/SyncStorageEngine.java

+18 −16
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ public class SyncStorageEngine extends Handler { 
    public void clearAllBackoffs(SyncQueue syncQueue) {

        boolean changed = false;

        synchronized (mAuthorities) {

            synchronized (syncQueue) {

                for (AccountInfo accountInfo : mAccounts.values()) {

                    for (AuthorityInfo authorityInfo : accountInfo.authorities.values()) {

                        if (authorityInfo.backoffTime != NOT_IN_BACKOFF_MODE
@@ -630,6 +631,7 @@ public class SyncStorageEngine extends Handler { 
                    }

                }

            }

        }



        if (changed) {

            reportChange(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS);

core/java/android/content/pm/RegisteredServicesCache.java

+2 −1
Original line number Diff line number Diff line
@@ -264,7 +264,8 @@ public abstract class RegisteredServicesCache<V> { 
            if (user.services == null) {

                generateServicesMap(userId);

            }

            return Collections.unmodifiableCollection(user.services.values());

            return Collections.unmodifiableCollection(

                    new ArrayList<ServiceInfo<V>>(user.services.values()));

        }

    }