diff options
| author | Vadim Tryshev <vadimt@google.com> | 2018-05-10 19:12:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-10 19:12:43 -0700 |
| commit | 60762daf6d8cc72f4a7c998136e15711d8d0191b (patch) | |
| tree | 0a016599c82b8ae098f529c514a79d5e5706226b | |
| parent | d2962e783f1f542c456ed5220f1ced5ddb57dc9e (diff) | |
| parent | 630e6d6877bf424e70519a612e1f059169c498ed (diff) | |
| download | loganalysis-60762daf6d8cc72f4a7c998136e15711d8d0191b.tar.gz | |
Fixing app transition tests
am: 630e6d6877
Change-Id: I962d85d097334251aad8781389a2e72424cab989
| -rw-r--r-- | src/com/android/loganalysis/item/TransitionDelayItem.java | 22 | ||||
| -rw-r--r-- | src/com/android/loganalysis/parser/EventsLogParser.java | 6 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/com/android/loganalysis/item/TransitionDelayItem.java b/src/com/android/loganalysis/item/TransitionDelayItem.java index b91f926..6e09d4b 100644 --- a/src/com/android/loganalysis/item/TransitionDelayItem.java +++ b/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); + } } diff --git a/src/com/android/loganalysis/parser/EventsLogParser.java b/src/com/android/loganalysis/parser/EventsLogParser.java index b69948d..1e1803c 100644 --- a/src/com/android/loganalysis/parser/EventsLogParser.java +++ b/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)) { |