commit 058de98e44580aecdfe195b0589ee1d552d088e9
author Aaron Tsai <tsaiaaron@google.com> Fri May 14 03:02:50 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 14 03:02:50 2021 +0000
tree 6b2f3d1f62fefedc5ed98e6abd60054d4179a0c3
parent 0a3ca7b62918e576044d20b06a8efa6a186ceb5a
parent 845f0fbd1e4d940d058cbb18f92ae4c15553ce39

Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6"

radio/1.6/vts/functional/radio_hidl_hal_misc.cpp

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));
         }
     }