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

Commit 608d2626 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Rename Permission2 to PermissionPolicy in TEST_MAPPING" into udc-dev... 

Merge "Rename Permission2 to PermissionPolicy in TEST_MAPPING" into udc-dev am: 2697a1f8 am: b2d2b60d

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



Change-Id: I3910144080f9a25b4c40b8e8e62341acf4e075b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c43cc118 b2d2b60d

core/java/android/app/TEST_MAPPING

+2 −2
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ 
        },

        {

            "file_patterns": ["(/|^)AppOpsManager.java"],

            "name": "CtsPermission2TestCases",

            "name": "CtsPermissionPolicyTestCases",

            "options": [

                {

                    "include-filter": "android.permission2.cts.RuntimePermissionProperties"

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

                }

            ]

        },

core/res/TEST_MAPPING

+3 −3
Original line number Diff line number Diff line 
{

    "presubmit": [

        {

            "name": "CtsPermission2TestCases",

            "name": "CtsPermissionPolicyTestCases",

            "options": [

                {

                    "include-filter": "android.permission2.cts.PermissionPolicyTest#platformPermissionPolicyIsUnaltered"

                    "include-filter": "android.permissionpolicy.cts.PermissionPolicyTest#platformPermissionPolicyIsUnaltered"

                },

                {

                    "include-filter": "android.permission2.cts.RuntimePermissionProperties"

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

                }

            ]

        }

data/etc/TEST_MAPPING

+2 −2
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
    "presubmit": [

        {

            "file_patterns": ["(/|^)platform.xml"],

            "name": "CtsPermission2TestCases",

            "name": "CtsPermissionPolicyTestCases",

            "options": [

                {

                    "include-filter": "android.permission2.cts.RuntimePermissionProperties"

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

                }

            ]

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
            ]

        },

        {

            "name": "CtsPermission2TestCases",

            "name": "CtsPermissionPolicyTestCases",

            "options": [

                {

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

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

                },

                {

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

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

+4 −4
Original line number Diff line number Diff line
@@ -29,16 +29,16 @@ 
      ]

    },

    {

      "name": "CtsPermission2TestCases",

      "name": "CtsPermissionPolicyTestCases",

      "options": [

        {

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

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

        },

        {

          "include-filter": "android.permission2.cts.RestrictedStoragePermissionSharedUidTest"

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

        },

        {

          "include-filter": "android.permission2.cts.RestrictedStoragePermissionTest"

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

        }

      ]

    },