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

Commit 705a7650 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Update test_mapping with the new network policy tests" into main... 

Merge "Merge "Update test_mapping with the new network policy tests" into main am: 49bba3e3 am: 46614781" into main
parents 14618db7 a7351f7f

apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING

+3 −3
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ 
            ]

        },

        {

            "name": "CtsHostsideNetworkTests",

            "name": "CtsHostsideNetworkPolicyTests",

            "options": [

                {"include-filter": "com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testMeteredNetworkAccess_expeditedJob"},

                {"include-filter": "com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testNonMeteredNetworkAccess_expeditedJob"}

                {"include-filter": "com.android.cts.netpolicy.HostsideRestrictBackgroundNetworkTests#testMeteredNetworkAccess_expeditedJob"},

                {"include-filter": "com.android.cts.netpolicy.HostsideRestrictBackgroundNetworkTests#testNonMeteredNetworkAccess_expeditedJob"}

            ]

        },

        {

services/core/java/com/android/server/net/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line 
{

  "presubmit-large": [

    {

      "name": "CtsHostsideNetworkTests",

      "name": "CtsHostsideNetworkPolicyTests",

      "options": [

        {

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