Merge "Rename Permission2 to PermissionPolicy in TEST_MAPPING" into udc-dev am: 2697a1f8ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21486695 Change-Id: Ia1abad5a6a3f6316ee9e2fb5712e82d572ee7cdc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -42,10 +42,10 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"file_patterns": ["(/|^)AppOpsManager.java"],
|
"file_patterns": ["(/|^)AppOpsManager.java"],
|
||||||
"name": "CtsPermission2TestCases",
|
"name": "CtsPermissionPolicyTestCases",
|
||||||
"options": [
|
"options": [
|
||||||
{
|
{
|
||||||
"include-filter": "android.permission2.cts.RuntimePermissionProperties"
|
"include-filter": "android.permissionpolicy.cts.RuntimePermissionProperties"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"presubmit": [
|
"presubmit": [
|
||||||
{
|
{
|
||||||
"name": "CtsPermission2TestCases",
|
"name": "CtsPermissionPolicyTestCases",
|
||||||
"options": [
|
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
"presubmit": [
|
"presubmit": [
|
||||||
{
|
{
|
||||||
"file_patterns": ["(/|^)platform.xml"],
|
"file_patterns": ["(/|^)platform.xml"],
|
||||||
"name": "CtsPermission2TestCases",
|
"name": "CtsPermissionPolicyTestCases",
|
||||||
"options": [
|
"options": [
|
||||||
{
|
{
|
||||||
"include-filter": "android.permission2.cts.RuntimePermissionProperties"
|
"include-filter": "android.permissionpolicy.cts.RuntimePermissionProperties"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,10 +26,10 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "CtsPermission2TestCases",
|
"name": "CtsPermissionPolicyTestCases",
|
||||||
"options": [
|
"options": [
|
||||||
{
|
{
|
||||||
"include-filter": "android.permission2.cts.RestrictedPermissionsTest"
|
"include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"include-filter": "android.permission.cts.PermissionMaxSdkVersionTest"
|
"include-filter": "android.permission.cts.PermissionMaxSdkVersionTest"
|
||||||
|
|||||||
@@ -29,16 +29,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "CtsPermission2TestCases",
|
"name": "CtsPermissionPolicyTestCases",
|
||||||
"options": [
|
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user