summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stanislav Zholnin <zholnin@google.com> 2020-04-15 10:10:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-15 10:10:55 +0000
commit962b13c5eee0311ed303212b267f6819e40b44ce (patch)
treec82ecec7841d6b043f25cbd3206a958ea524fb96
parentf3b2dc9b03e008d148eeda13e68fe547d96abe79 (diff)
parenta9f3788c4f006d993beebd587415498bb1d045c9 (diff)
Merge "add AppOpsTest to related frameworks TEST_MAPPINGS" into rvc-dev
-rw-r--r--core/java/android/app/TEST_MAPPING4
-rw-r--r--services/core/java/com/android/server/appop/TEST_MAPPING3
2 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index ab868604dfde..344a4d79b766 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -20,6 +20,10 @@
},
{
"file_patterns": ["(/|^)AppOpsManager.java"],
+ "name": "UidAtomTests:testAppOps"
+ },
+ {
+ "file_patterns": ["(/|^)AppOpsManager.java"],
"name": "FrameworksServicesTests",
"options": [
{
diff --git a/services/core/java/com/android/server/appop/TEST_MAPPING b/services/core/java/com/android/server/appop/TEST_MAPPING
index 9c03a3606e6c..604b9f1ead6d 100644
--- a/services/core/java/com/android/server/appop/TEST_MAPPING
+++ b/services/core/java/com/android/server/appop/TEST_MAPPING
@@ -38,6 +38,9 @@
},
{
"name": "CtsAppTestCases:ActivityManagerApi29Test"
+ },
+ {
+ "name": "UidAtomTests:testAppOps"
}
]
}