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

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

Merge "Exclude androidx.test.filters.FlakyTest in TEST_MAPPING" into udc-dev... 

Merge "Exclude androidx.test.filters.FlakyTest in TEST_MAPPING" into udc-dev am: bc28899e am: 6401506a

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



Change-Id: I82afbe44993fd1823367b9186b3774f044f0c998
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49129631 6401506a

packages/SystemUI/TEST_MAPPING

+6 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,9 @@ 
        },

        },

        {

        {

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        },

        {

            "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

        }

      ]

      ]

    }

    }
@@ -128,6 +131,9 @@ 
        },

        },

        {

        {

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        },

        {

            "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

        }

      ]

      ]

    }

    }