| commit | 0b857c60d43a28232fdc3b4b8a3acfbad613d24d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Oct 04 21:50:33 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Oct 04 21:50:33 2019 +0000 |
| tree | 304855e9fe49373a5ca3a2b397a3e2496e9169ed | |
| parent | bb842a90be24809807720ade89c8064d80676642 [diff] | |
| parent | ef6d7dade7346f2a13869b8bc27cbb9f042c51d0 [diff] |
Merge "DO NOT MERGE Test: .ActivityManagerAmStartOptionsTests: Waiting for SingleTaskActivity transition idle" into pie-cts-dev
diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerAmStartOptionsTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerAmStartOptionsTests.java index cf62868..cab0879 100644 --- a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerAmStartOptionsTests.java +++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerAmStartOptionsTests.java
@@ -89,6 +89,8 @@ // See TODO below // final LogSeparator logSeparator = separateLogs(); + mAmWmState.waitForAppTransitionIdle(); + // Pass in different data only when cold starting. This is to make the intent // different in subsequent warm/hot launches, so that the entrypoint alias // activity is always started, but the actual activity is not started again