commit | 26c9ae45925fdb71b6f2c35e3c5be7927c6ad42e | [log] [tgz] |
---|---|---|
author | Andrii Kulian <akulian@google.com> | Fri Apr 29 15:48:02 2022 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 29 15:48:02 2022 +0000 |
tree | 7bb33ee05dd2fb8b4087829937d192162740edaf | |
parent | 70b756c65aa61888c0fc5d97733943b59381722b [diff] | |
parent | 1180fb6b54dd3f128e91d246a3efcd3f80699e88 [diff] |
Merge "Ignore failing placeholder test" into tm-dev
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingPlaceholderTests.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingPlaceholderTests.java index bc00111..814956e 100644 --- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingPlaceholderTests.java +++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingPlaceholderTests.java
@@ -39,6 +39,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.window.extensions.embedding.SplitPlaceholderRule; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -139,6 +140,7 @@ * activity it launched with is not finished. */ @Test + @Ignore public void testPlaceholderFinishPrimaryWithSecondary_FinishNever() { // Set embedding rules with finishPrimaryWithSecondary set to FINISH_NEVER final SplitPlaceholderRule splitPlaceholderRule =