From 2f50a8d510299b038ad4ed626a7ce095152eecd4 Mon Sep 17 00:00:00 2001
From: openharmony_ci <120357966@qq.com>
Date: Wed, 22 Mar 2023 12:07:30 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!565=20:?=
 =?UTF-8?q?=20feat:add=20CloseUnFinishedUssd=20interfaces'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 telephony/ril/hdi_v1.0/BUILD.gn               |  2 +-
 .../ril/hdi_v1.0/hdf_ril_hdiService_test.cpp  | 39 +++++++------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/telephony/ril/hdi_v1.0/BUILD.gn b/telephony/ril/hdi_v1.0/BUILD.gn
index 49f7769e..081c4b6e 100644
--- a/telephony/ril/hdi_v1.0/BUILD.gn
+++ b/telephony/ril/hdi_v1.0/BUILD.gn
@@ -38,7 +38,7 @@ ohos_moduletest_suite("HatsHdfV1RilServiceTest") {
   if (is_standard_system) {
     external_deps = [
       "c_utils:utils",
-      "drivers_interface_ril:libril_proxy_1.1",
+      "drivers_interface_ril:libril_proxy_1.0",
       "hdf_core:libhdf_utils",
       "hiviewdfx_hilog_native:libhilog",
       "ipc:ipc_single",
diff --git a/telephony/ril/hdi_v1.0/hdf_ril_hdiService_test.cpp b/telephony/ril/hdi_v1.0/hdf_ril_hdiService_test.cpp
index 243274ca..86ac7927 100644
--- a/telephony/ril/hdi_v1.0/hdf_ril_hdiService_test.cpp
+++ b/telephony/ril/hdi_v1.0/hdf_ril_hdiService_test.cpp
@@ -24,9 +24,9 @@
 #include "securec.h"
 #include "stdlib.h"
 #include "unistd.h"
-#include "v1_1/iril.h"
+#include "v1_0/iril.h"
 
-using namespace OHOS::HDI::Ril::V1_1;
+using namespace OHOS::HDI::Ril::V1_0;
 using namespace testing::ext;
 
 enum class HdiId {
@@ -37,7 +37,7 @@ enum class HdiId {
     HREQ_CALL_HANGUP,
     HREQ_CALL_REJECT,
     HREQ_CALL_ANSWER,
-    HREQ_CALL_HOLD_CALL,   // call hold value 6
+    HREQ_CALL_HOLD_CALL, // call hold value 6
     HREQ_CALL_UNHOLD_CALL, // call active value 6
     HREQ_CALL_SWITCH_CALL,
     HREQ_CALL_COMBINE_CONFERENCE,
@@ -66,7 +66,6 @@ enum class HdiId {
     HREQ_CALL_SET_EMERGENCY_LIST,
     HREQ_CALL_GET_FAIL_REASON,
     HREQ_CALL_SET_BARRING_PASSWORD,
-    HREQ_CALL_CLOSE_UNFINISHED_USSD,
 
     HREQ_SMS_BASE = 100,
     HREQ_SMS_SEND_GSM_SMS,
@@ -277,7 +276,6 @@ public:
     int32_t GetMuteResponse(const RilRadioResponseInfo &responseInfo, int32_t mute) override;
     int32_t GetCallFailReasonResponse(const RilRadioResponseInfo &responseInfo, int32_t callFail) override;
     int32_t SetBarringPasswordResponse(const RilRadioResponseInfo &responseInfo) override;
-    int32_t CloseUnFinishedUssdResponse(const RilRadioResponseInfo &responseInfo) override;
 
     // Data
     int32_t PdpContextListUpdated(
@@ -395,14 +393,14 @@ public:
 
     // Sms
     int32_t NewSmsNotify(
-        const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo) override;
+        const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo) override;
     int32_t NewCdmaSmsNotify(
-        const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo) override;
+        const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo) override;
     int32_t SmsStatusReportNotify(
-        const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo) override;
-    int32_t NewSmsStoredOnSimNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t recordNumber,
+        const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo) override;
+    int32_t NewSmsStoredOnSimNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t recordNumber,
         int32_t indicationType) override;
-    int32_t CBConfigNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
+    int32_t CBConfigNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
         const CBConfigReportInfo &cellBroadConfigReportInfo) override;
     int32_t SendGsmSmsResponse(
         const RilRadioResponseInfo &responseInfo, const SendSmsResultInfo &sendSmsResultInfo) override;
@@ -596,7 +594,7 @@ int32_t RilCallback::SimRefreshNotify(const RilRadioResponseInfo &responseInfo)
 }
 
 int32_t RilCallback::GetSimStatusResponse(
-    const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CardStatusInfo &result)
+    const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CardStatusInfo &result)
 {
     HDF_LOGI("GetBoolResult GetSimStatus result : slotId = %{public}d, simType = %{public}d, simState = %{public}d",
         responseInfo.slotId, result.simType, result.simState);
@@ -1520,15 +1518,6 @@ int32_t RilCallback::SetBarringPasswordResponse(const RilRadioResponseInfo &resp
     return 0;
 }
 
-int32_t RilCallback::CloseUnFinishedUssdResponse(const RilRadioResponseInfo &responseInfo)
-{
-    HDF_LOGI("GetBoolResult CloseUnFinishedUssdResponse");
-    hdiId_ = HdiId::HREQ_CALL_CLOSE_UNFINISHED_USSD;
-    resultInfo_ = responseInfo;
-    NotifyAll();
-    return 0;
-}
-
 /**
  * modem
  **/
@@ -1749,28 +1738,28 @@ int32_t RilCallback::SetDataProfileInfoResponse(const RilRadioResponseInfo &resp
 
 // Sms
 int32_t RilCallback::NewSmsNotify(
-    const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo)
+    const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo)
 {
     HDF_LOGI("RilCallback::NewSmsNotify smsMessageInfo size : %{public}d", smsMessageInfo.size);
     return 0;
 }
 
 int32_t RilCallback::NewCdmaSmsNotify(
-    const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo)
+    const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo)
 {
     HDF_LOGI("RilCallback::NewCdmaSmsNotify smsMessageInfo size : %{public}d", smsMessageInfo.size);
     return 0;
 }
 
 int32_t RilCallback::SmsStatusReportNotify(
-    const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo)
+    const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const SmsMessageInfo &smsMessageInfo)
 {
     HDF_LOGI("RilCallback::SmsStatusReportNotify smsMessageInfo size : %{public}d", smsMessageInfo.size);
     return 0;
 }
 
 int32_t RilCallback::NewSmsStoredOnSimNotify(
-    const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t recordNumber, int32_t indicationType)
+    const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t recordNumber, int32_t indicationType)
 {
     HDF_LOGI("RilCallback::NewSmsStoredOnSimNotify recordNumber : %{public}d, indicationType : %{public}d",
         recordNumber, indicationType);
@@ -1778,7 +1767,7 @@ int32_t RilCallback::NewSmsStoredOnSimNotify(
 }
 
 int32_t RilCallback::CBConfigNotify(
-    const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const CBConfigReportInfo &cellBroadConfigReportInfo)
+    const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const CBConfigReportInfo &cellBroadConfigReportInfo)
 {
     HDF_LOGI("RilCallback::CBConfigNotify cellBroadConfigReportInfo dcs : %{public}s",
         cellBroadConfigReportInfo.dcs.c_str());
-- 
Gitee