Merge 25Q1 (ab/12770256) to aosp-main-future
Bug: 385190204
Merged-In: If1b2b860305f3a02384debe20cd314244901237b
Change-Id: I5057a94f19b9bb35722ed1d8653fb6fd0c34aa78
diff --git a/tests/bluetooth/Android.bp b/tests/bluetooth/Android.bp
index bdd14dd..ccb5125 100644
--- a/tests/bluetooth/Android.bp
+++ b/tests/bluetooth/Android.bp
@@ -40,6 +40,7 @@
"cts_root",
"general-tests",
"mts-bluetooth",
+ "mts-bt",
],
min_sdk_version: "UpsideDownCake",
}
diff --git a/tests/bluetooth/AndroidTest.xml b/tests/bluetooth/AndroidTest.xml
index 87be477..97bf9d8 100644
--- a/tests/bluetooth/AndroidTest.xml
+++ b/tests/bluetooth/AndroidTest.xml
@@ -46,7 +46,7 @@
<!-- Only run Cts Tests in MTS if the Bluetooth Mainline module is installed. -->
<object type="module_controller"
class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
- <option name="mainline-module-package-name" value="com.android.btservices" />
- <option name="mainline-module-package-name" value="com.google.android.btservices" />
+ <option name="mainline-module-package-name" value="com.android.bt" />
+ <option name="mainline-module-package-name" value="com.google.android.bt" />
</object>
</configuration>
diff --git a/tests/bluetooth/OWNERS b/tests/bluetooth/OWNERS
index f5f3106..8719a0c 100644
--- a/tests/bluetooth/OWNERS
+++ b/tests/bluetooth/OWNERS
@@ -2,4 +2,3 @@
muhammadfalam@google.com
sattiraju@google.com
girardier@google.com
-sungsoo@google.com
diff --git a/tests/packagewatchdog/OWNERS b/tests/packagewatchdog/OWNERS
index b929d27..86b12cd 100644
--- a/tests/packagewatchdog/OWNERS
+++ b/tests/packagewatchdog/OWNERS
@@ -1,4 +1,3 @@
# Bug component: 1306443
-ancr@google.com
harshitmahajan@google.com
wangchun@google.com
\ No newline at end of file
