Merge "exclude flaky tests for 9.0 R2" into pi-dev
diff --git a/nfc/V1_0/target/AndroidTest.xml b/nfc/V1_0/target/AndroidTest.xml
index bef110b..098c34f 100644
--- a/nfc/V1_0/target/AndroidTest.xml
+++ b/nfc/V1_0/target/AndroidTest.xml
@@ -28,6 +28,8 @@
<option name="binary-test-stop-native-servers" value="true"/>
<option name="exclude-coverage-path" value="frameworks/av/media"/>
<option name="exclude-coverage-path" value="frameworks/rs"/>
+ <!-- b/77998208: Flaky test; requires a fix in vendor code -->
+ <option name="exclude-filter" value="NfcHidlTest.CoreInitialized" />
<option name="test-timeout" value="15m"/>
<option name="runtime-hint" value="5m"/>
</test>
diff --git a/radio/V1_0/target/radio/AndroidTest.xml b/radio/V1_0/target/radio/AndroidTest.xml
index 9bde838..55c2ce4 100644
--- a/radio/V1_0/target/radio/AndroidTest.xml
+++ b/radio/V1_0/target/radio/AndroidTest.xml
@@ -29,5 +29,9 @@
<option name="test-timeout" value="15m"/>
<!-- The following test is disabled due to b/64734869 -->
<option name="exclude-filter" value="RadioHidlTest.requestShutdown" />
+ <!-- b/109889468: Requires a live SIM card or a vendor code update -->
+ <option name="exclude-filter" value="RadioHidlTest.getImsiForApp" />
+ <!-- b/79930549: Flaky test -->
+ <option name="exclude-filter" value="RadioHidlTest.setAllowedCarriers" />
</test>
</configuration>
