Merge "Mark UserControllerTest.testStartUser_background as @FlakyTest"

1 files changed, 2 insertions, 0 deletions

diff --git a/services/tests/wmtests/src/com/android/server/am/UserControllerTest.java b/services/tests/wmtests/src/com/android/server/am/UserControllerTest.java
index e55c4f7031a8..7c5ee8eaa42d 100644
--- a/services/tests/wmtests/src/com/android/server/am/UserControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/am/UserControllerTest.java
@@ -68,6 +68,7 @@ import android.os.UserManagerInternal;
 import android.platform.test.annotations.Presubmit;
 import android.util.Log;
 
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.SmallTest;
 
 import com.android.server.pm.UserManagerService;
@@ -148,6 +149,7 @@ public class UserControllerTest {
         startForegroundUserAssertions();
     }
 
+    @FlakyTest(bugId = 118932054)
     @Test
     public void testStartUser_background() {
         mUserController.startUser(TEST_USER_ID, false /* foreground */);