commit 1e2f00fa699a1fbccf053b6d160c9f3c94173768
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 13 19:54:13 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 13 19:54:13 2021 +0000
tree 4cf92b67b8cb470426144284723287ff574f7f17
parent b67528725212c359737e6d5fe3d9981fc2e00f63
parent ea051abaf1e7c8fd3d11b0c650f771d7e1897c93

Merge "make descrambler test optional since it may be provided through tuner module since cas@1.2" into android11-tests-dev

radio/1.0/vts/functional/vts_test_util.h

diff --git a/radio/1.0/vts/functional/vts_test_util.h b/radio/1.0/vts/functional/vts_test_util.h
index 5df162e..3554763 100644
--- a/radio/1.0/vts/functional/vts_test_util.h
+++ b/radio/1.0/vts/functional/vts_test_util.h
@@ -36,6 +36,10 @@
 
 static constexpr const char* FEATURE_TELEPHONY = "android.hardware.telephony";
 
+static constexpr const char* FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";
+
+static constexpr const char* FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";
+
 /*
  * Generate random serial number for radio test
  */

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 2ce5375..1eed499 100644
--- a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp
@@ -34,8 +34,9 @@
     if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {
         ALOGI("Skipping emergencyDial because voice call is not supported in device");
         return;
-    } else if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
-        ALOGI("Skipping emergencyDial because telephony radio is not supported in device");
+    } else if (!deviceSupportsFeature(FEATURE_TELEPHONY_GSM) &&
+               !deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+        ALOGI("Skipping emergencyDial because gsm/cdma radio is not supported in device");
         return;
     } else {
         ALOGI("Running emergencyDial because voice call is supported in device");
@@ -75,8 +76,9 @@
     if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {
         ALOGI("Skipping emergencyDial because voice call is not supported in device");
         return;
-    } else if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
-        ALOGI("Skipping emergencyDial because telephony radio is not supported in device");
+    } else if (!deviceSupportsFeature(FEATURE_TELEPHONY_GSM) &&
+               !deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+        ALOGI("Skipping emergencyDial because gsm/cdma radio is not supported in device");
         return;
     } else {
         ALOGI("Running emergencyDial because voice call is supported in device");
@@ -117,8 +119,9 @@
     if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {
         ALOGI("Skipping emergencyDial because voice call is not supported in device");
         return;
-    } else if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
-        ALOGI("Skipping emergencyDial because telephony radio is not supported in device");
+    } else if (!deviceSupportsFeature(FEATURE_TELEPHONY_GSM) &&
+               !deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+        ALOGI("Skipping emergencyDial because gsm/cdma radio is not supported in device");
         return;
     } else {
         ALOGI("Running emergencyDial because voice call is supported in device");