Merge change 23909 into eclair

* changes:
  Add ddms support for contacts.

2 files changed, 23 insertions, 3 deletions

diff --git a/tools/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/DisplaySync.java b/tools/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/DisplaySync.java
index 82cc7a440..1c006bcda 100644
--- a/tools/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/DisplaySync.java
+++ b/tools/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/DisplaySync.java
@@ -229,8 +229,14 @@ public class DisplaySync extends SyncCommon {
                 sb.append("sync already in progress\n");
             } else if ("I".equals(key)) {
                 sb.append("io exception\n");
+            } else if (auth == CONTACTS && "g".equals(key)) {
+                sb.append("aggregation query: ").append(val).append("\n");
+            } else if (auth == CONTACTS && "G".equals(key)) {
+                sb.append("aggregation merge: ").append(val).append("\n");
+            } else if (auth == CONTACTS && "n".equals(key)) {
+                sb.append("num entries: ").append(val).append("\n");
             } else if (auth == CONTACTS && "p".equals(key)) {
-                sb.append("photos uploaded from client: ").append(val).append("\n");
+                sb.append("photos uploaded from server: ").append(val).append("\n");
             } else if (auth == CONTACTS && "P".equals(key)) {
                 sb.append("photos downloaded from server: ").append(val).append("\n");
             } else if (auth == CALENDAR && "F".equals(key)) {
@@ -290,4 +296,4 @@ public class DisplaySync extends SyncCommon {
     int getDisplayType() {
         return DISPLAY_TYPE_SYNC;
     }
-}
\ No newline at end of file
+}
diff --git a/tools/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/SyncCommon.java b/tools/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/SyncCommon.java
index 108c097a4..0a355d1e9 100644
--- a/tools/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/SyncCommon.java
+++ b/tools/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/SyncCommon.java
@@ -48,6 +48,7 @@ abstract public class SyncCommon extends EventDisplay {
     final int EVENT_SYNC = 2720;
     final int EVENT_TICKLE = 2742;
     final int EVENT_SYNC_DETAILS = 2743;
+    final int EVENT_CONTACTS_AGGREGATION = 2747;
 
     protected SyncCommon(String name) {
         super(name);
@@ -111,6 +112,18 @@ abstract public class SyncCommon extends EventDisplay {
                                 false, mLastSyncSource);
                     }
                 }
+            } else if (event.mTag == EVENT_CONTACTS_AGGREGATION) {
+                long stopTime = (long) event.sec * 1000L + (event.nsec / 1000000L);
+                long startTime = stopTime - Long.parseLong(event.getValueAsString(0));
+                String details;
+                int count = Integer.parseInt(event.getValueAsString(1));
+                if (count < 0) {
+                    details = "g" + (-count);
+                } else {
+                    details = "G" + count;
+                }
+                processSyncEvent(event, CONTACTS, startTime, stopTime, details,
+                        true /* newEvent */, mLastSyncSource);
             }
         } catch (InvalidTypeException e) {
         }
@@ -141,7 +154,8 @@ abstract public class SyncCommon extends EventDisplay {
     protected int getAuth(String authname) throws InvalidTypeException {
         if ("calendar".equals(authname) || "cl".equals(authname)) {
             return CALENDAR;
-        } else if ("contacts".equals(authname) || "cp".equals(authname)) {
+        } else if ("contacts".equals(authname) || "cp".equals(authname) ||
+                "com.android.contacts".equals(authname)) {
             return CONTACTS;
         } else if ("subscribedfeeds".equals(authname)) {
             return FEEDS;