| commit | 63f6d9bb3a05b9c75f28efdbd7bf339eca44b3f3 | [log] [tgz] |
|---|---|---|
| author | Aaron Tsai <tsaiaaron@google.com> | Fri May 14 03:49:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 14 03:49:24 2021 +0000 |
| tree | d369b73dc566e6edb735601371245d66902eea22 | |
| parent | f989c1bae57eaa18eee8c9322c4f61e975c7c54f [diff] | |
| parent | 90f0c0e3be898c19e15a77cf96b02286409c78b2 [diff] |
Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" am: 058de98e44 am: 90f0c0e3be Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699825 Change-Id: I17209d9f01e8673f1e327968f20b2a0e75945e22
diff --git a/radio/1.6/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.6/vts/functional/radio_hidl_hal_misc.cpp index 4222441..8c99d92 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_misc.cpp
@@ -45,10 +45,8 @@ ::android::hardware::radio::V1_0::RadioError::NONE) { static const std::regex kOperatorNumericRe("^[0-9]{5,6}$"); for (OperatorInfo info : radioRsp_v1_6->networkInfos) { - if (info.operatorNumeric != nullptr) { - ASSERT_TRUE( - std::regex_match(std::string(info.operatorNumeric), kOperatorNumericRe)); - } + ASSERT_TRUE( + std::regex_match(std::string(info.operatorNumeric), kOperatorNumericRe)); } }