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

Commit d1d010fd authored by Ronald Braunstein's avatar Ronald Braunstein Committed by Automerger Merge Worker
Browse files

Merge "Convert CtsPermissionTestCase to test_module_config." into main am:... 

Merge "Convert CtsPermissionTestCase to test_module_config." into main am: bccb3623 am: af99c846

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



Change-Id: I0eda8f5681d70cb7b7dda6b7469f66312d3b14b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c36a3c7 af99c846

core/java/android/permission/TEST_MAPPING

+2 −10
Original line number Diff line number Diff line 
{

    "presubmit": [

        {

            "name": "CtsPermissionTestCases",

            "options": [

                {

                    "include-filter": "android.permission.cts.PermissionControllerTest"

                },

                {

                    "include-filter": "android.permission.cts.RuntimePermissionPresentationInfoTest"

                }

            ]

            "name": "CtsPermissionTestCases_Platform"

        }

    ],

    "postsubmit": [

core/java/com/android/internal/infra/TEST_MAPPING

+1 −9
Original line number Diff line number Diff line
@@ -9,15 +9,7 @@ 
      ]

    },

    {

      "name": "CtsPermissionTestCases",

      "options": [

          {

            "include-filter": "android.permission.cts.PermissionControllerTest"

          },

          {

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

          }

      ]

      "name": "CtsPermissionTestCases_Platform"

    },

    {

      "name": "FrameworksCoreTests_internal_infra"

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

+1 −18
Original line number Diff line number Diff line
@@ -18,24 +18,7 @@ 
            "name": "FrameworksMockingServicesTests_android_server_appop"

        },

        {

            "name": "CtsPermissionTestCases",

            "options": [

                {

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

                },

                {

                    "include-filter": "android.permission.cts.BackgroundPermissionsTest"

                },

                {

                    "include-filter": "android.permission.cts.SplitPermissionTest"

                },

                {

                    "include-filter": "android.permission.cts.PermissionFlagsTest"

                },

                {

                    "include-filter": "android.permission.cts.SharedUidPermissionsTest"

                }

            ]

            "name": "CtsPermissionTestCases_Platform"

        },

        {

            "name": "CtsAppTestCases",

services/core/java/com/android/server/pm/permission/TEST_MAPPING

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

    "presubmit": [

        {

            "name": "CtsPermissionTestCases",

            "options": [

                {

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

                },

                {

                    "include-filter": "android.permission.cts.BackgroundPermissionsTest"

                },

                {

                    "include-filter": "android.permission.cts.SplitPermissionTest"

                },

                {

                    "include-filter": "android.permission.cts.PermissionFlagsTest"

                },

                {

                    "include-filter": "android.permission.cts.SharedUidPermissionsTest"

                }

            ]

            "name": "CtsPermissionTestCases_Platform"

        },

        {

            "name": "CtsAppSecurityHostTestCases",

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

+1 −12
Original line number Diff line number Diff line
@@ -46,18 +46,7 @@ 
      ]

    },

    {

      "name": "CtsPermissionTestCases",

      "options": [

        {

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

        },

        {

          "include-filter": "android.permission.cts.SplitPermissionTest"

        },

        {

          "include-filter": "android.permission.cts.BackgroundPermissionsTest"

        }

      ]

      "name": "CtsPermissionTestCases_Platform"

    },

    {

      "name": "CtsBackupTestCases",