commit 06485a7c6e3bbea1f427f345ac3a18b2346750e0
author Matthew Williams <mjwilliams@google.com> Fri Jul 26 12:56:39 2013 -0700
committer Matthew Williams <mjwilliams@google.com> Mon Sep 16 15:23:41 2013 -0700
tree ec25556c025afd966e155f67de4752abb7ad477a
parent df2dae01b065ef18b7de7f76b29a9857bf70f443

Pending op fix didn't merge properly from KLP-dev.

Manually merge in Cl c/342668. Add another test to ensure that it
WAI.

Change-Id: Iae603328d525cc71e4e31ad30a13384efc50f823

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

diff --git a/services/java/com/android/server/content/SyncStorageEngine.java b/services/java/com/android/server/content/SyncStorageEngine.java
index f843a62..1d8ca5a 100644
--- a/services/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/java/com/android/server/content/SyncStorageEngine.java
@@ -362,6 +362,12 @@
                 periodicSyncs.add(defaultSync);
             }
         }
+
+        @Override
+        public String toString() {
+            return target + ", enabled=" + enabled + ", syncable=" + syncable + ", backoff="
+                    + backoffTime + ", delay=" + delayUntil;
+        }
     }
 
     public static class SyncHistoryItem {
@@ -1084,7 +1090,7 @@
             pop = new PendingOperation(authority, op.reason, op.syncSource, op.extras,
                     op.expedited);
             mPendingOperations.add(pop);
-            writePendingOperationsLocked();
+            appendPendingOperationLocked(pop);
 
             SyncStatusInfo status = getOrCreateSyncStatusLocked(authority.ident);
             status.pending = true;
@@ -2416,6 +2422,9 @@
         }
         try {
             fis = mPendingFile.openRead();
+            if (Log.isLoggable(TAG_FILE, Log.VERBOSE)) {
+                Log.v(TAG_FILE, "Reading " + mPendingFile.getBaseFile());
+            }
             XmlPullParser parser;
             parser = Xml.newPullParser();
             parser.setInput(fis, null);
@@ -2427,12 +2436,11 @@
             }
             if (eventType == XmlPullParser.END_DOCUMENT) return; // Nothing to read.
 
-            String tagName = parser.getName();
             do {
                 PendingOperation pop = null;
                 if (eventType == XmlPullParser.START_TAG) {
                     try {
-                        tagName = parser.getName();
+                        String tagName = parser.getName();
                         if (parser.getDepth() == 1 && "op".equals(tagName)) {
                             // Verify version.
                             String versionString =
@@ -2556,17 +2564,11 @@
             fos = mPendingFile.startWrite();
             XmlSerializer out = new FastXmlSerializer();
             out.setOutput(fos, "utf-8");
-            out.startDocument(null, true);
-            out.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);
-
-            out.startTag(null, "pending");
-            out.attribute(null, "version", Integer.toString(PENDING_OPERATION_VERSION));
 
             for (int i = 0; i < N; i++) {
                 PendingOperation pop = mPendingOperations.get(i);
                 writePendingOperationLocked(pop, out);
              }
-             out.endTag(null, "pending");
              out.endDocument();
              mPendingFile.finishWrite(fos);
         } catch (java.io.IOException e1) {