Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b845ba1 authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge "Migrate Dream Mocking Services tests" into main

parents dd6a9312 268ca268

services/tests/dreamservicetests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ android_test { 
        "frameworks-base-testutils",

        "mockito-target-minus-junit4",

        "services.core",

        "mockingservicestests-utils-mockito",

    ],



    platform_apis: true,

services/tests/mockingservicestests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java→services/tests/dreamservicetests/src/com/android/server/dreams/DreamManagerServiceMockingTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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();