From 171014dadf341490d96ab75983f29e3e565cfeba Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Thu, 2 Sep 2021 01:12:32 +0000
Subject: [PATCH] Add back tethering to TEST_MAPPING

Tethering was removed from test mapping during S development
in some branches, but needs to be part of mainline-test-mapping
testing.

Change-Id: I440e9ae1aa958addab1c53b441e5e9e87a6d757d
Ignore-AOSP-First: Fixes difference with AOSP
Bug: 196755836
Test: TH needs to test TEST_MAPPING config
---
 TEST_MAPPING                          | 3 +--
 tests/cts/net/AndroidTestTemplate.xml | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 0ac09cc89b..be0e0404ce 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -29,8 +29,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"
diff --git a/tests/cts/net/AndroidTestTemplate.xml b/tests/cts/net/AndroidTestTemplate.xml
index 474eefe7bf..78a01e29c1 100644
--- a/tests/cts/net/AndroidTestTemplate.xml
+++ b/tests/cts/net/AndroidTestTemplate.xml
@@ -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" />