Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename Permission2 to PermissionPolicy in TEST_MAPPING" into udc-dev am: 2697a1f8ac am: b2d2b60dbd

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

Change-Id: I3910144080f9a25b4c40b8e8e62341acf4e075b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nate Myren
2023-03-21 17:53:49 +00:00
committed by Automerger Merge Worker
parent c43cc11896 b2d2b60dbd
commit 608d2626b6
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/TEST_MAPPING
View File

@@ -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"
}
]
},

6
core/res/TEST_MAPPING
View File

@@ -1,13 +1,13 @@
{
"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"
}
]
}

4
data/etc/TEST_MAPPING
View File

@@ -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"
}
]
}

4
services/core/java/com/android/server/pm/permission/TEST_MAPPING
View File

@@ -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"

8
services/core/java/com/android/server/policy/TEST_MAPPING
View File

@@ -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"
}
]
},