Merge "Enable IRadio AIDL VTS tests" am: 1b51643add am: 9257a65735

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032264

Change-Id: I64e2fa79b11fea3e895a99b30e7f38b093597723
This commit is contained in:
Sarah Chin 2022-03-21 18:30:14 +00:00 committed by Automerger Merge Worker
commit 9cad82c4b7
2 changed files with 6 additions and 8 deletions

View file

@ -72,9 +72,8 @@ cc_test {
"android.hardware.radio.sim-V1-ndk",
"android.hardware.radio.voice-V1-ndk",
],
// TODO(b/210712359): enable after b/207695009 is resolved.
//test_suites: [
// "general-tests",
// "vts",
//],
test_suites: [
"general-tests",
"vts",
],
}

View file

@ -376,8 +376,6 @@ TEST_P(RadioSimTest, getAllowedCarriers) {
* Test IRadioSim.setAllowedCarriers() for the response returned.
*/
TEST_P(RadioSimTest, setAllowedCarriers) {
// TODO (b/210712359): remove once shim supports 1.4 or alternative is found
GTEST_SKIP();
serial = GetRandomSerialNumber();
CarrierRestrictions carrierRestrictions;
memset(&carrierRestrictions, 0, sizeof(carrierRestrictions));
@ -411,7 +409,8 @@ TEST_P(RadioSimTest, setAllowedCarriers) {
sleep(2);
updateSimCardStatus();
}
EXPECT_EQ(CardStatus::STATE_RESTRICTED, cardStatus.cardState);
// TODO: uncomment once CF fully supports setAllowedCarriers
// EXPECT_EQ(CardStatus::STATE_RESTRICTED, cardStatus.cardState);
}
/* Verify that configuration was set correctly, retrieving it from the modem */