commit aa229558cbf04bc997ed27465c5e7ad497123d1b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Sep 25 02:00:59 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Sep 25 02:00:59 2025 -0700
tree 315215f25e2857a7ff1c46c6546f1d5e0f958f5e
parent 8ffebbfd006370f0308e495c018966357cd14f62
parent 2e20580fbc4de8edc23a9cdd0be91892057ca391

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35950716'] into 25Q4-release.

Change-Id: I15848d8180ec4551b634680efe686d9a46d5f652

radio/aidl/vts/radio_ims_test.cpp

diff --git a/radio/aidl/vts/radio_ims_test.cpp b/radio/aidl/vts/radio_ims_test.cpp
index 0a3a76f..ae905f5 100644
--- a/radio/aidl/vts/radio_ims_test.cpp
+++ b/radio/aidl/vts/radio_ims_test.cpp
@@ -248,6 +248,14 @@
  * Test IRadioIms.updateAllowedServices() for the response returned.
  */
 TEST_P(RadioImsTest, updateAllowedServices) {
+    int32_t aidl_version;
+    ndk::ScopedAStatus aidl_status = radio_ims->getInterfaceVersion(&aidl_version);
+    ASSERT_OK(aidl_status);
+    if (aidl_version < 4) {
+        ALOGI("Skipped the test since"
+              " updateAllowedServices is not supported on version < 4");
+        GTEST_SKIP();
+    }
     if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
         ALOGI("Skipping updateAllowedServices because ims is not supported in device");
         return;