| commit | 8900a1e345bfab98784d272647ff7b73358b9a6a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Feb 04 02:08:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 04 02:08:07 2023 +0000 |
| tree | 1866f06f37307c893a425ade39226251650b27e6 | |
| parent | efe8d1a7a4ca6bd00b24411898721bd61feb485d [diff] | |
| parent | 221de90c1675b93c464bfc9ae92e8490bd5b4c50 [diff] |
Merge "VtsHalRadioV1_4Target.setPreferredNetworkTypeBitmap" into android12L-tests-dev am: 78cdf668a8 am: 221de90c16 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2375494 Change-Id: Ia0b554a43999591ae024e58fd53f8a2741b8cb85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp index b0b984c..8f357a0 100644 --- a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp
@@ -232,7 +232,8 @@ EXPECT_EQ(serial, radioRsp_v1_4->rspInfo.serial); ALOGI("setPreferredNetworkTypeBitmap, rspInfo.error = %s\n", toString(radioRsp_v1_4->rspInfo.error).c_str()); - EXPECT_EQ(RadioError::NONE, radioRsp_v1_4->rspInfo.error); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_4->rspInfo.error, + {RadioError::NONE, RadioError::MODE_NOT_SUPPORTED})); if (radioRsp_v1_4->rspInfo.error == RadioError::NONE) { // give some time for modem to set the value. sleep(3);