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

Commit 3f11e9d8 authored by Anna Zhuravleva's avatar Anna Zhuravleva
Browse files

Use androidx Flaky annotation for device tests. 

Platform_testing flaky annotation is for
host side tests and will be restricted, device
tests should use androidx annotation.

Bug: 293837621
Test: build
Change-Id: I7fe9deb19194cefe1b8e2a7e2b9ea258c1086e0f
parent 9da1aaeb

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"