From 1f1357b0ef4e53091e2649aeac73303ec0c23c07 Mon Sep 17 00:00:00 2001
From: Quang Anh Luong <qal@google.com>
Date: Thu, 22 Feb 2024 13:53:59 +0900
Subject: [PATCH] Add CtsTetheringTest to MTS

Similar to aosp/2963602, move to CtsTetheringTest instead of
CtsTetheringTestLatestSdk.

Bug: b/325564242
Test: m, aapt dump badging, verify (min)sdkVersion=30, targetSdk=10000
Change-Id: I4159448686455c988a1b9cd233af5e411e1cc7ad
---
 tests/cts/tethering/Android.bp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/cts/tethering/Android.bp b/tests/cts/tethering/Android.bp
index 392896167f..10231736eb 100644
--- a/tests/cts/tethering/Android.bp
+++ b/tests/cts/tethering/Android.bp
@@ -47,6 +47,7 @@ java_defaults {
 
     // Change to system current when TetheringManager move to bootclass path.
     platform_apis: true,
+    min_sdk_version: "30",
     host_required: ["net-tests-utils-host-common"],
 }
 
@@ -80,8 +81,8 @@ android_test {
 
 // Tethering CTS tests for development and release. These tests always target the platform SDK
 // version, and are subject to all the restrictions appropriate to that version. Before SDK
-// finalization, these tests have a min_sdk_version of 10000, and cannot be installed on release
-// devices.
+// finalization, these tests have a min_sdk_version of 10000, but they can still be installed on
+// release devices as their min_sdk_version is set to a production version.
 android_test {
     name: "CtsTetheringTest",
     defaults: ["CtsTetheringTestDefaults"],
@@ -93,6 +94,14 @@ android_test {
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
+        "mts-dnsresolver",
+        "mts-networking",
+        "mts-tethering",
+        "mts-wifi",
+        "mcts-dnsresolver",
+        "mcts-networking",
+        "mcts-tethering",
+        "mcts-wifi",
         "general-tests",
     ],