commit 36dbe44529ec019887f016c7e85c47ad459c3067
author Aaron Tsai <tsaiaaron@google.com> Fri May 14 04:39:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 14 04:39:38 2021 +0000
tree 28562472de490f1b4087e98ec4d6074ab9fb3891
parent d459723072e713093363944d3958681b85fdaf7c
parent 63f6d9bb3a05b9c75f28efdbd7bf339eca44b3f3

Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" am: 058de98e44 am: 90f0c0e3be am: 63f6d9bb3a

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

Change-Id: I9b26440107d6213c405683204a656406c59f0d92

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