commit 80e74102352ad23bb25a04bf719d0e2cc27e222e
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 11 18:47:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 11 18:47:55 2022 +0000
tree 8974d154a5bfc5aa6862492ad78289a70c3d03bb
parent b3644be75ed65af27d284122058ec5517b3116ed
parent be09db54d25ee62408ca01d1806b17ebcdb73969

Merge changes I45e60f32,I2c8d3a16 am: 210c44dbe1 am: be09db54d2

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

Change-Id: Ia8041d0535ed64452e06ee2e9c5c4eac76f0f326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

radio/aidl/vts/radio_config_test.cpp

diff --git a/radio/aidl/vts/radio_config_test.cpp b/radio/aidl/vts/radio_config_test.cpp
index 2309f9e..81d87d2 100644
--- a/radio/aidl/vts/radio_config_test.cpp
+++ b/radio/aidl/vts/radio_config_test.cpp
@@ -59,6 +59,7 @@
     serial = GetRandomSerialNumber();
     ndk::ScopedAStatus res = radio_config->getHalDeviceCapabilities(serial);
     ASSERT_OK(res);
+    EXPECT_EQ(std::cv_status::no_timeout, wait());
     ALOGI("getHalDeviceCapabilities, rspInfo.error = %s\n",
           toString(radioRsp_config->rspInfo.error).c_str());
 }
@@ -70,6 +71,7 @@
     serial = GetRandomSerialNumber();
     ndk::ScopedAStatus res = radio_config->getSimSlotsStatus(serial);
     ASSERT_OK(res);
+    EXPECT_EQ(std::cv_status::no_timeout, wait());
     ALOGI("getSimSlotsStatus, rspInfo.error = %s\n",
           toString(radioRsp_config->rspInfo.error).c_str());
 }