LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Do not install tethering in TEST_MAPPING"

Browse Source 
This reverts commit c2858740c1.

Reason for revert: tethering in mainline-prod should always be
updatable.

Bug: 167645754
Test: treehugger
Ignore-AOSP-First: this change must not go into AOSP
Change-Id: I0e60eb2c4a1a2e8e985c8ff91d343d1255ddf783
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
This commit is contained in:
Lorenzo Colitti
2021-02-25 17:33:40 +09:00
parent ac80a885b0
commit 5de0092e3c
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
TEST_MAPPING
View File

@@ -13,8 +13,7 @@
],
"mainline-presubmit": [
{
// TODO: add back the tethering modules when updatable in this branch
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]",
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"options": [
{
"exclude-annotation": "com.android.testutils.SkipPresubmit"
@@ -25,8 +24,7 @@
// Tests on physical devices with SIM cards: postsubmit only for capacity constraints
"mainline-postsubmit": [
{
// TODO: add back the tethering module when updatable in this branch
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]",
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"keywords": ["sim"]
}
]

1
tests/cts/net/AndroidTestTemplate.xml
View File

@@ -21,7 +21,6 @@
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />
<option name="not-shardable" value="true" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />