Merge commit '0e0f6003' into manualmerge (95906af2) · Commits · e / os / android_frameworks_base

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

+31 −21

Original line number	Diff line number	Diff line
		@@ -98,7 +98,6 @@ import java.util.List;
		import java.util.Map;
		import java.util.Random;
		import java.util.Set;
		import java.util.concurrent.CountDownLatch;

		/**
		* @hide
		@@ -1891,15 +1890,20 @@ public class SyncManager {
		public final SyncTimeTracker mSyncTimeTracker = new SyncTimeTracker();
		private final HashMap<String, PowerManager.WakeLock> mWakeLocks = Maps.newHashMap();

		private volatile CountDownLatch mReadyToRunLatch = new CountDownLatch(1);
		private List<Message> mBootQueue = new ArrayList<Message>();

		public void onBootCompleted() {
		mBootCompleted = true;

		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		Log.v(TAG, "Boot completed, clearing boot queue.");
		}
		doDatabaseCleanup();

		if (mReadyToRunLatch != null) {
		mReadyToRunLatch.countDown();
		synchronized(this) {
		// Dispatch any stashed messages.
		for (Message message : mBootQueue) {
		sendMessage(message);
		}
		mBootQueue = null;
		mBootCompleted = true;
		}
		}

		@@ -1915,20 +1919,24 @@ public class SyncManager {
		return wakeLock;
		}

		private void waitUntilReadyToRun() {
		CountDownLatch latch = mReadyToRunLatch;
		if (latch != null) {
		while (true) {
		try {
		latch.await();
		mReadyToRunLatch = null;
		return;
		} catch (InterruptedException e) {
		Thread.currentThread().interrupt();
		}
		/**
		* Stash any messages that come to the handler before boot is complete.
		* {@link #onBootCompleted()} will disable this and dispatch all the messages collected.
		* @param msg Message to dispatch at a later point.
		* @return true if a message was enqueued, false otherwise. This is to avoid losing the
		* message if we manage to acquire the lock but by the time we do boot has completed.
		*/
		private boolean tryEnqueueMessageUntilReadyToRun(Message msg) {
		synchronized (this) {
		if (!mBootCompleted) {
		// Need to copy the message bc looper will recycle it.
		mBootQueue.add(Message.obtain(msg));
		return true;
		}
		return false;
		}
		}

		/**
		* Used to keep track of whether a sync notification is active and who it is for.
		*/
		@@ -1957,13 +1965,15 @@ public class SyncManager {
		}

		public void handleMessage(Message msg) {
		if (tryEnqueueMessageUntilReadyToRun(msg)) {
		return;
		}

		long earliestFuturePollTime = Long.MAX_VALUE;
		long nextPendingSyncTime = Long.MAX_VALUE;

		// Setting the value here instead of a method because we want the dumpsys logs
		// to have the most recent value used.
		try {
		waitUntilReadyToRun();
		mDataConnectionIsConnected = readDataConnectionState();
		mSyncManagerWakeLock.acquire();
		// Always do this first so that we be sure that any periodic syncs that