diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-13 07:23:00 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-13 07:23:00 +0000 |
commit | cdb8b3596de27e912bb865af797a4e5dae744255 (patch) | |
tree | 0a016599c82b8ae098f529c514a79d5e5706226b | |
parent | 901dd3b342b7dc3ed012a9430166a7aff307d719 (diff) | |
parent | 630e6d6877bf424e70519a612e1f059169c498ed (diff) | |
download | loganalysis-pie-r2-release.tar.gz |
Snap for 4778776 from 630e6d6877bf424e70519a612e1f059169c498ed to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testing
Change-Id: Id302ecf3ae53987aa0aaee9e92d6f9c7842123e9
-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)) { |