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

Commit dd5a9ee5 authored by Robert Marcus's avatar Robert Marcus Committed by Automerger Merge Worker
Browse files

Merge "Update tplus to have min_sdk_version 33" into udc-mainline-prod am: d1f7c234 

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



Change-Id: If52e51795a1296b0c3d1293b6bb37c611018c117
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f415dd3e d1f7c234

TEST_MAPPING

+18 −2
Original line number Diff line number Diff line
@@ -74,7 +74,15 @@ 
      ]

    },

    {

      "name": "ExtServicesUnitTests",

      "name": "ExtServicesUnitTests-tplus",

      "options": [

        {

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

        }

      ]

    },

    {

      "name": "ExtServicesUnitTests-sminus",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"
@@ -142,7 +150,15 @@ 
     ]

   },

   {

     "name": "ExtServicesUnitTests",

     "name": "ExtServicesUnitTests-tplus",

     "options": [

       {

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

       }

     ]

   },

   {

     "name": "ExtServicesUnitTests-sminus",

     "options": [

       {

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