From 268ca26806cbfbc2f43d3c1cc2d76c7294c0ac53 Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Thu, 27 Jul 2023 14:59:02 +0000
Subject: [PATCH] Migrate Dream Mocking Services tests

- Move Mocking test
- @FlakyTest it, since its failing (it wasn't runnning in presubmit
  anyway)

Bug: 290763662
Test: atest DreamServiceTests
Change-Id: I045bed08e90b0c021ec83f568b132cd3282b0145
---
 services/tests/dreamservicetests/Android.bp                     | 1 +
 .../android/server/dreams/DreamManagerServiceMockingTest.java   | 2 ++
 2 files changed, 3 insertions(+)
 rename services/tests/{mockingservicestests => dreamservicetests}/src/com/android/server/dreams/DreamManagerServiceMockingTest.java (98%)

diff --git a/services/tests/dreamservicetests/Android.bp b/services/tests/dreamservicetests/Android.bp
index b698a605ddb77..8ef443e29cf60 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
similarity index 98%
rename from services/tests/mockingservicestests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java
rename to services/tests/dreamservicetests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java
index c02cbd1c9d087..32d4e756d5897 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();