summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rahul Banerjee <rahulbanerjee@google.com> 2022-11-21 23:01:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-21 23:01:32 +0000
commitd10e3c23489665b664ae6da777e8349d573761a4 (patch)
treef25cdfa5e512fb1866b96bca5cde4490a737b73d
parent000666efa56463bf96333107c4c8c344e834d7a4 (diff)
parentecad4649c4e025c150bab73201c42cd5bb3f430e (diff)
Merge "Disable ControlsFavoritingActivityTest" into tm-qpr-dev am: ecad4649c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20509865 Change-Id: I5ab8eec08a695c6e10bb6c19d71a2c4537e8b9a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt
index 0f06de2a0684..365523233353 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt
@@ -5,6 +5,7 @@ import android.testing.AndroidTestingRunner
import android.testing.TestableLooper
import android.window.OnBackInvokedCallback
import android.window.OnBackInvokedDispatcher
+import androidx.test.filters.FlakyTest
import androidx.test.filters.SmallTest
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.intercepting.SingleActivityFactory
@@ -79,6 +80,8 @@ class ControlsFavoritingActivityTest : SysuiTestCase() {
activityRule.launchActivity(intent)
}
+ // b/259549854 to root-cause and fix
+ @FlakyTest
@Test
fun testBackCallbackRegistrationAndUnregistration() {
// 1. ensure that launching the activity results in it registering a callback