commit 532dcfd48a25c6313d4bdd74f1457a0603c017e2
author Zoey Chen <zoeychen@google.com> Tue Apr 06 23:23:55 2021 +0800
committer Zoey Chen <zoeychen@google.com> Wed Apr 21 05:12:17 2021 +0000
tree f2a44821d3d7f96d3e502bcdb1f6b99c2f5dd098
parent ed54acfbff499fedf179910cb43a4c0f91d902e9

[ANAPIC Review] Modify radio 1.6 based on ANAPIC comment

 - setupDataCall_1_6, remove "same as 1.5" comment
 - sendSMSExpectMore to sendSmsExpectMore
 - getAllowedNetworkTypesBitmap should use int32_t
 - csiCqiReport uses uint8_t
 - cellBandwidthDownlinkKhz and cellBandwidthUplinkKhz
 - AccessTechnologySpecificInfo, remove these struct NgranRegistrationInfo and GeranRegistrationInfo

Bug: 183738486
Test: make
Change-Id: Icae28d68831bbd01836b8d464e8ece134a9aa63d
Merged-In: Icae28d68831bbd01836b8d464e8ece134a9aa63d

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 87320da..235093d 100644
--- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
@@ -204,10 +204,10 @@
 }
 
 /*
- * Test IRadio_1_6.sendSMSExpectMore() for the response returned.
+ * Test IRadio_1_6.sendSmsExpectMore() for the response returned.
  */
-TEST_P(RadioHidlTest_v1_6, sendSMSExpectMore_1_6) {
-    LOG(DEBUG) << "sendSMSExpectMore";
+TEST_P(RadioHidlTest_v1_6, sendSmsExpectMore_1_6) {
+    LOG(DEBUG) << "sendSmsExpectMore";
     serial = GetRandomSerialNumber();
     GsmSmsMessage msg;
     msg.smscPdu = "";
@@ -227,7 +227,7 @@
              ::android::hardware::radio::V1_6::RadioError::SIM_ABSENT},
             CHECK_GENERAL_ERROR));
     }
-    LOG(DEBUG) << "sendSMSExpectMore finished";
+    LOG(DEBUG) << "sendSmsExpectMore finished";
 }
 
 /*

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

diff --git a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
index 4fc17e5..0689e9b 100644
--- a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
+++ b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
@@ -762,7 +762,7 @@
             const ::android::hardware::radio::V1_6::RadioResponseInfo& info,
             const SendSmsResult& sms);
 
-    Return<void> sendSMSExpectMoreResponse_1_6(
+    Return<void> sendSmsExpectMoreResponse_1_6(
             const ::android::hardware::radio::V1_6::RadioResponseInfo& info,
             const SendSmsResult& sms);
 

radio/1.6/vts/functional/radio_response.cpp

diff --git a/radio/1.6/vts/functional/radio_response.cpp b/radio/1.6/vts/functional/radio_response.cpp
index 2b6d1bb..942964b 100644
--- a/radio/1.6/vts/functional/radio_response.cpp
+++ b/radio/1.6/vts/functional/radio_response.cpp
@@ -1090,7 +1090,7 @@
     return Void();
 }
 
-Return<void> RadioResponse_v1_6::sendSMSExpectMoreResponse_1_6(
+Return<void> RadioResponse_v1_6::sendSmsExpectMoreResponse_1_6(
         const ::android::hardware::radio::V1_6::RadioResponseInfo& info,
         const SendSmsResult& sms) {
     rspInfo = info;