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

Commit 1f9293e0 authored by Patrick Baumann's avatar Patrick Baumann Committed by Automerger Merge Worker
Browse files

Merge changes from topic "b/262254794" into tm-dev am: a79341e0 

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



Change-Id: Iab8047221133617e489fffe9010edefefc1287cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15c1ca9b a79341e0

TEST_MAPPING

+30 −0
Original line number Diff line number Diff line
@@ -15,6 +15,22 @@ 
      ]

    }

  ],

  "presubmit-pm": [

    {

      "name": "PackageManagerServiceServerTests",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

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

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    }

  ],

  "presubmit": [

    {

      "name": "ManagedProvisioningTests",
@@ -167,6 +183,20 @@ 
         "exclude-annotation": "org.junit.Ignore"

       }

     ]

   },

   {

     "name": "PackageManagerServiceServerTests",

     "options": [

       {

         "include-annotation": "android.platform.test.annotations.Presubmit"

       },

       {

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

       },

       {

         "exclude-annotation": "org.junit.Ignore"

       }

     ]

   }

 ]

}

services/tests/servicestests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ android_test { 
        "hamcrest-library",

        "servicestests-utils",

        "service-jobscheduler",

        "service-permission.impl",

        // TODO: remove once Android migrates to JUnit 4.12,

        // which provides assertThrows

        "testng",