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

Commit 1b66ee9c authored by Anna Zhuravleva's avatar Anna Zhuravleva Committed by Android (Google) Code Review
Browse files

Merge "Use androidx Flaky annotation for device tests." into main

parents 4f5cb1b3 3f11e9d8

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

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
            "name": "CtsAppOpsTestCases",

            "options": [

                {

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

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

                }

            ]

        },
@@ -31,7 +31,7 @@ 
            "name": "CtsPermissionTestCases",

            "options": [

                {

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

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

                },

                {

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

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

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
            "name": "CtsPermissionTestCases",

            "options": [

                {

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

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

                },

                {

                    "include-filter": "android.permission.cts.BackgroundPermissionsTest"
@@ -32,7 +32,7 @@ 
            "name": "CtsPermissionPolicyTestCases",

            "options": [

                {

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

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

                },

                {

                    "include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"

services/permission/TEST_MAPPING

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
            "name": "CtsPermissionTestCases",

            "options": [

                {

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

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

                },

                {

                    "include-filter": "android.permission.cts.BackgroundPermissionsTest"
@@ -32,7 +32,7 @@ 
            "name": "CtsPermissionPolicyTestCases",

            "options": [

                {

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

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

                },

                {

                    "include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"