diff options
author | Vadim Tryshev <vadimt@google.com> | 2018-05-08 18:59:18 -0700 |
---|---|---|
committer | Vadim Tryshev <vadimt@google.com> | 2018-05-09 13:10:56 -0700 |
commit | 630e6d6877bf424e70519a612e1f059169c498ed (patch) | |
tree | 0a016599c82b8ae098f529c514a79d5e5706226b | |
parent | d2962e783f1f542c456ed5220f1ced5ddb57dc9e (diff) | |
download | loganalysis-630e6d6877bf424e70519a612e1f059169c498ed.tar.gz |
Fixing app transition testsandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-vts-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-cts-releasepie-cts-devpie-b4s4-releasepie-b4s4-dev
Using WINDOWS_DRAWN_DELAY where needed, switching from relying on
Recents activity to the Launcher one.
Removing cold launches in the beginning in removeAdditionalLaunchInfo.
Bug: 72967764
Test: Running app transition tests locally
Change-Id: Iec8c2ad2cdfc0fb2e570f114cd26897f3607e71f
-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)) { |