summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/tests/dreamservicetests/Android.bp1
-rw-r--r--services/tests/dreamservicetests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java (renamed from services/tests/mockingservicestests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java)2
2 files changed, 3 insertions, 0 deletions
diff --git a/services/tests/dreamservicetests/Android.bp b/services/tests/dreamservicetests/Android.bp
index b698a605ddb7..8ef443e29cf6 100644
--- a/services/tests/dreamservicetests/Android.bp
+++ b/services/tests/dreamservicetests/Android.bp
@@ -16,6 +16,7 @@ android_test {
"frameworks-base-testutils",
"mockito-target-minus-junit4",
"services.core",
+ "mockingservicestests-utils-mockito",
],
platform_apis: true,
diff --git a/services/tests/mockingservicestests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java b/services/tests/dreamservicetests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java
index c02cbd1c9d08..32d4e756d589 100644
--- a/services/tests/mockingservicestests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java
+++ b/services/tests/dreamservicetests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java
@@ -36,6 +36,7 @@ import android.os.UserManager;
import android.provider.Settings;
import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.FlakyTest;
import com.android.server.LocalServices;
import com.android.server.SystemService;
@@ -102,6 +103,7 @@ public class DreamManagerServiceMockingTest {
}
@Test
+ @FlakyTest(bugId = 293443309)
public void testSettingsQueryUserChange() {
final DreamManagerService service = createService();