commit 90f0c0e3be898c19e15a77cf96b02286409c78b2
author Aaron Tsai <tsaiaaron@google.com> Fri May 14 03:24:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 14 03:24:24 2021 +0000
tree 6b2f3d1f62fefedc5ed98e6abd60054d4179a0c3
parent 56ffb537099a88c39e4a80ba9d6db1eec19e2233
parent 058de98e44580aecdfe195b0589ee1d552d088e9

Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" am: 058de98e44

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

Change-Id: I1d76c931f944a62f59f71b4e26ab4257ee1c5b29

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