commit d3ce7bce7ae4eb7d4fd12beccb7958a2fc83886d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 06 13:55:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 06 13:55:28 2019 +0000
tree 7997f80a0f3177192c559951e42bd5984bfafbc7
parent 620eeefa4312a28f0db78cab6659bfc3c9ed0f10
parent 06480bc24da018ddf8d119cb545872173c5026ef

Merge changes from topic "sensors_vts" into android10-tests-dev

* changes:
  Fix assumptions in SensorsHidlTest.NoStaleEvents
  Add support for new gralloc HAL versions
  Change expected return type in direct report VTS
  VTS Sensor HAL 2.0: Fix Batch for One Shot sensors
  Fix handling of reportToken when stopping
  Avoid NPD when re-initializing HAL fails
  Fix NPD in GrallocWrapper
  Fix log tag for sensors VTS tests

radio/1.4/vts/functional/radio_hidl_hal_api.cpp

diff --git a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp
index 40706a2..fed89b0 100644
--- a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp
@@ -149,7 +149,8 @@
     EXPECT_EQ(serial, radioRsp_v1_4->rspInfo.serial);
     ALOGI("setPreferredNetworkTypeBitmap, rspInfo.error = %s\n",
           toString(radioRsp_v1_4->rspInfo.error).c_str());
-    EXPECT_EQ(RadioError::NONE, radioRsp_v1_4->rspInfo.error);
+    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_4->rspInfo.error,
+                                 {RadioError::NONE, RadioError::MODE_NOT_SUPPORTED}));
     if (radioRsp_v1_4->rspInfo.error == RadioError::NONE) {
          // give some time for modem to set the value.
         sleep(3);