Merge PPR1.180514.001

Change-Id: Iaa26001313ea1dc75d4f816d0844ba2e130f62a6

src/com/android/loganalysis/item/TransitionDelayItem.java

@@ -32,9 +32,17 @@ public class TransitionDelayItem extends GenericItem {
     public static final String TRANSITION_DELAY = "TRANSITION_DELAY";
     /** Constant for JSON output */
     public static final String DATE_TIME = "DATE_TIME";
+    /** Constant for JSON output */
+    public static final String WINDOW_DRAWN_DELAY = "WINDOW_DRAWN_DELAY";
 
-    private static final Set<String> ATTRIBUTES = new HashSet<String>(Arrays.asList(
-            COMPONENT_NAME, START_WINDOW_DELAY, TRANSITION_DELAY, DATE_TIME));
+    private static final Set<String> ATTRIBUTES =
+            new HashSet<String>(
+                    Arrays.asList(
+                            COMPONENT_NAME,
+                            START_WINDOW_DELAY,
+                            TRANSITION_DELAY,
+                            DATE_TIME,
+                            WINDOW_DRAWN_DELAY));
 
     /**
      * The constructor for {@link TransitionDelayItem}.
@@ -79,4 +87,14 @@ public class TransitionDelayItem extends GenericItem {
     public void setDateTime(String dateTime) {
         setAttribute(DATE_TIME, dateTime);
     }
+
+    public Long getWindowDrawnDelay() {
+        return getAttribute(WINDOW_DRAWN_DELAY) != null
+                ? (Long) getAttribute(WINDOW_DRAWN_DELAY)
+                : null;
+    }
+
+    public void setWindowDrawnDelay(long windowDrawnDelay) {
+        setAttribute(WINDOW_DRAWN_DELAY, windowDrawnDelay);
+    }
 }

src/com/android/loganalysis/parser/EventsLogParser.java

@@ -54,6 +54,7 @@ public class EventsLogParser implements IParser {
     private static final String TRANSITION_DELAY_KEY = "319";
     private static final String STARTING_WINDOW_DELAY_KEY = "321";
     private static final String COLD_LAUNCH_KEY = "945";
+    private static final String WINDOWS_DRAWN_DELAY_KEY = "322";
 
     @Override
     public IItem parse(List<String> lines) {
@@ -80,13 +81,16 @@ public class EventsLogParser implements IParser {
                     TransitionDelayItem delayItem = new TransitionDelayItem();
                     if (null != transitionInfoMap.get(PACKAGE_KEY)
                             && null != transitionInfoMap.get(ACTIVITY_KEY)
-                            && null != transitionInfoMap.get(TRANSITION_DELAY_KEY)) {
+                            && null != transitionInfoMap.get(TRANSITION_DELAY_KEY)
+                            && null != transitionInfoMap.get(WINDOWS_DRAWN_DELAY_KEY)) {
                         delayItem.setComponentName(transitionInfoMap.get(PACKAGE_KEY) + "/"
                                 + transitionInfoMap.get(ACTIVITY_KEY));
                         delayItem.setTransitionDelay(Long.parseLong(transitionInfoMap
                                 .get(TRANSITION_DELAY_KEY)));
                         delayItem.setDateTime(String.format("%s %s", match.group(DATE),
                                 match.group(TIME)));
+                        delayItem.setWindowDrawnDelay(
+                                Long.parseLong(transitionInfoMap.get(WINDOWS_DRAWN_DELAY_KEY)));
                     }
                     if (transitionInfoMap.containsKey(COLD_LAUNCH_KEY)) {
                         if (null != transitionInfoMap.get(STARTING_WINDOW_DELAY_KEY)) {