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

Merge changes from topic "b/262254794" into tm-dev am: a79341e01e

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

Change-Id: I7ac756783fc92f8e5f1547d2964de81ccc5733dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Patrick Baumann
2022-12-20 23:56:22 +00:00
committed by Automerger Merge Worker
parent bbacb30ce5 a79341e01e
commit c37d549f2a
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
TEST_MAPPING
View File

@@ -15,6 +15,22 @@
] ]
} }
], ],
"presubmit-pm": [
{
"name": "PackageManagerServiceServerTests",
"options": [
{
"include-annotation": "android.platform.test.annotations.Presubmit"
},
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "org.junit.Ignore"
}
]
}
],
"presubmit": [ "presubmit": [
{ {
"name": "ManagedProvisioningTests", "name": "ManagedProvisioningTests",
@@ -167,6 +183,20 @@
"exclude-annotation": "org.junit.Ignore" "exclude-annotation": "org.junit.Ignore"
} }
] ]
},
{
"name": "PackageManagerServiceServerTests",
"options": [
{
"include-annotation": "android.platform.test.annotations.Presubmit"
},
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "org.junit.Ignore"
}
]
} }
] ]
} }

1
services/tests/servicestests/Android.bp
View File

@@ -55,7 +55,6 @@ android_test {
"hamcrest-library", "hamcrest-library",
"servicestests-utils", "servicestests-utils",
"service-jobscheduler", "service-jobscheduler",
"service-permission.impl",
// TODO: remove once Android migrates to JUnit 4.12, // TODO: remove once Android migrates to JUnit 4.12,
// which provides assertThrows // which provides assertThrows
"testng", "testng",