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

Commit e03cbdb6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Annotate test in MediaProjectionManagerServiceTest as flaky" into... 

Merge "Annotate test in MediaProjectionManagerServiceTest as flaky" into udc-qpr-dev am: 48d0cf2c am: 6ab3d505

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24178309



Change-Id: Ic4ed6de10f6ef775d7f3c3198d7216743417bfda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 242b47e7 6ab3d505

services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import android.platform.test.annotations.Presubmit; 
import android.view.ContentRecordingSession;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;

import androidx.test.platform.app.InstrumentationRegistry;
@@ -688,6 +689,7 @@ public class MediaProjectionManagerServiceTest { 
        assertThat(mService.isCurrentProjection(projection)).isTrue();

    }



    @FlakyTest(bugId = 288342281)

    @Test

    public void setContentRecordingSession_successful_notifiesListeners()

            throws Exception {