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

Commit 9c9efaaa authored by Dan Shi's avatar Dan Shi Committed by android-build-merger
Browse files

Merge changes Idccade48,I3213bc92 

am: e27c6704

Change-Id: Id16108592446dc783ba008c1fae17ffd0c3ad3db
parents bac0e054 e27c6704

src/com/android/packageinstaller/permission/service/TEST_MAPPING

+10 −23
Original line number Diff line number Diff line
@@ -23,38 +23,25 @@ 
            ]

        }

    ],

    "postsubmit": [

    "presubmit-devicepolicy": [

        {

            "name": "CtsPermissionTestCases",

            "name": "CtsDevicePolicyManagerTestCases",

            "options": [

                {

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

                    "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest"

                },

                {

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

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

                }

            ]

        },

        }

    ],

    "postsubmit": [

        {

            "name": "CtsDevicePolicyManagerTestCases",

            "name": "CtsPermissionTestCases",

            "options": [

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrant"

                },

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionPolicy"

                },

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionMixedPolicies"

                },

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionAppUpdate"

                },

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrantPreMApp"

                },

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTestApi25#testPermissionGrantPreMApp"

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

                },

                {

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

src/com/android/packageinstaller/permission/ui/TEST_MAPPING

+12 −25
Original line number Diff line number Diff line 
{

    "postsubmit": [

        {

            "name": "CtsAppSecurityHostTestCases",

            "options": [

                {

                    "include-filter": "android.appsecurity.cts.PermissionsHostTest"

                }

            ]

        },

    "presubmit-devicepolicy": [

        {

            "name": "CtsDevicePolicyManagerTestCases",

            "options": [

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrantOfDisallowedPermissionWhileOtherPermIsGranted"

                },

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrant"

                },

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionPolicy"

                },

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionMixedPolicies"

                    "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest"

                },

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionAppUpdate"

                },

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

                }

            ]

        }

    ],

    "postsubmit": [

        {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrantPreMApp"

                },

            "name": "CtsAppSecurityHostTestCases",

            "options": [

                {

                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTestApi25#testPermissionGrantPreMApp"

                    "include-filter": "android.appsecurity.cts.PermissionsHostTest"

                }

            ]

        }