commit 9dca27c1426f348f2daa036728918e46a436a73f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 14 01:29:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 14 01:29:05 2021 +0000
tree dd3270e315024b7a255e46f9736be1c28026259f
parent e137d91e33e597e15b532993e22a9e1406bf976e
parent 9cb136f8a741b8105b5fd922de8bbaa34a15e042

Merge "Allow not supported for setNrDualConenctivity" am: de1aba4e76 am: aba41870f2 am: 7d0ef1ad57 am: 9cb136f8a7

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

Change-Id: I98e50d81d714710c855b986e5c4a25713961c314

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
index 2097589..63db370 100644
--- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
@@ -464,12 +464,13 @@
                 radioRsp_v1_6->rspInfo.error,
                 {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
     } else {
-        ASSERT_TRUE(
-                CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,
-                                 {::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
-                                  ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,
-                                  ::android::hardware::radio::V1_6::RadioError::INVALID_STATE,
-                                  ::android::hardware::radio::V1_6::RadioError::NONE}));
+        ASSERT_TRUE(CheckAnyOfErrors(
+                radioRsp_v1_6->rspInfo.error,
+                {::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
+                 ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,
+                 ::android::hardware::radio::V1_6::RadioError::INVALID_STATE,
+                 ::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,
+                 ::android::hardware::radio::V1_6::RadioError::NONE}));
     }
 }