Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: Ica1e1d90f13d4195ec2eb62ed2255f5b741e048c
Change-Id: I91a64c57baf9bd83f4117dd2ec4a5af3f3a59a45
diff --git a/apex/manifest.json b/apex/manifest.json
index c93258e..52a428b 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
{
"name": "com.android.tzdata",
- "version": 290000000
+ "version": 299900000
}
diff --git a/apex/tests/Android.bp b/apex/tests/Android.bp
index ad3f138..d5c524b 100644
--- a/apex/tests/Android.bp
+++ b/apex/tests/Android.bp
@@ -30,6 +30,6 @@
"general-tests",
"mts",
],
-
+ min_sdk_version: "29",
}
diff --git a/apex/tests/AndroidManifest.xml b/apex/tests/AndroidManifest.xml
index d64375e..5ea93c8 100644
--- a/apex/tests/AndroidManifest.xml
+++ b/apex/tests/AndroidManifest.xml
@@ -22,6 +22,8 @@
<uses-library android:name="android.test.runner" />
</application>
+ <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
+
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="android.tzdata.mts"
android:label="MTS tests for the tzdata mainline module">
diff --git a/apex/tests/AndroidTest.xml b/apex/tests/AndroidTest.xml
index 25a74db..c9a547a 100644
--- a/apex/tests/AndroidTest.xml
+++ b/apex/tests/AndroidTest.xml
@@ -27,7 +27,10 @@
<option name="runtime-hint" value="1m" />
</test>
- <object type="module_controller" class="com.android.tradefed.testtype.suite.module.TestFailureModuleController">
- <option name="screenshot-on-failure" value="false" />
+ <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+ <!-- This module is found on Q devices. -->
+ <option name="mainline-module-package-name" value="com.google.android.tzdata" />
+ <!-- This module is found on R+ devices. -->
+ <option name="mainline-module-package-name" value="com.google.android.tzdata2" />
</object>
</configuration>
