Merge "[SystemUI] Implement a way to put satin_dev.apk into test assets" into tm-dev am: 06f06e924c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18371499 Change-Id: I3fd089e5fcc9e36832eee55033767f3ba1487719 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -124,49 +124,5 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
|
||||||
"hubui-postsubmit": [
|
|
||||||
{
|
|
||||||
"name": "PlatformScenarioTests",
|
|
||||||
"options": [
|
|
||||||
{
|
|
||||||
"include-filter": "android.platform.test.scenario.hubui"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"include-annotation": "android.platform.test.scenario.annotation.HubUi"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"exclude-annotation": "org.junit.Ignore"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"exclude-annotation": "androidx.test.filters.FlakyTest"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"hubui-presubmit": [
|
|
||||||
{
|
|
||||||
"name": "PlatformScenarioTests",
|
|
||||||
"options": [
|
|
||||||
{
|
|
||||||
"include-annotation": "android.platform.test.annotations.Presubmit"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"include-annotation": "android.platform.test.scenario.annotation.HubUi"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"include-filter": "android.platform.test.scenario.hubui"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"exclude-annotation": "org.junit.Ignore"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"exclude-annotation": "androidx.test.filters.FlakyTest"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"exclude-annotation": "android.platform.test.annotations.Postsubmit"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user