From acb2e320cee2fde80763b6915e3f21e87a053f43 Mon Sep 17 00:00:00 2001 From: ASheLock Date: Mon, 25 Dec 2023 20:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A0=E5=8D=A1=E9=9A=8F?= =?UTF-8?q?=E5=8D=A1=E7=B4=A7=E6=80=A5=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ASheLock --- frameworks/js/sim/src/napi_sim.cpp | 4 ++++ .../innerkits/include/operator_config_types.h | 3 ++- interfaces/kits/js/@ohos.telephony.sim.d.ts | 18 ++++++++++++++++++ services/etc/carrier/operator_config.json | 3 ++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/frameworks/js/sim/src/napi_sim.cpp b/frameworks/js/sim/src/napi_sim.cpp index e00fa1908..59994120d 100755 --- a/frameworks/js/sim/src/napi_sim.cpp +++ b/frameworks/js/sim/src/napi_sim.cpp @@ -3001,6 +3001,10 @@ napi_status InitEnumOperatorConfigKey(napi_env env, napi_value exports) DECLARE_NAPI_STATIC_PROPERTY("KEY_OPL_CUST_STRING_ARRAY", GetNapiValue(env, "opl_cust_string_array")), DECLARE_NAPI_STATIC_PROPERTY("KEY_EMERGENCY_CALL_STRING_ARRAY", GetNapiValue(env, "emergency_call_string_array")), + DECLARE_NAPI_STATIC_PROPERTY("KEY_EMERGENCY_CALL_WITH_CARD_STRING_ARRAY", + GetNapiValue(env, "emergency_call_with_card_string_array")), + DECLARE_NAPI_STATIC_PROPERTY("KEY_EMERGENCY_CALL_NO_CARD_STRING_ARRAY", + GetNapiValue(env, "emergency_call_no_card_string_array")), }; constexpr size_t arrSize = sizeof(desc) / sizeof(desc[0]); diff --git a/interfaces/innerkits/include/operator_config_types.h b/interfaces/innerkits/include/operator_config_types.h index 16cf494f9..419c465c5 100755 --- a/interfaces/innerkits/include/operator_config_types.h +++ b/interfaces/innerkits/include/operator_config_types.h @@ -24,7 +24,8 @@ namespace OHOS { namespace Telephony { const std::string BROADCAST_ARG_SLOT_ID = "slotId"; -const std::string KEY_EMERGENCY_CALL_STRING_ARRAY = "emergency_call_string_array"; +const std::string KEY_EMERGENCY_CALL_WITH_CARD_STRING_ARRAY = "emergency_call_with_card_string_array"; +const std::string KEY_EMERGENCY_CALL_NO_CARD_STRING_ARRAY = "emergency_call_no_card_string_array"; const int32_t DEFAULT_CALL_WAITING_SERVICE_CLASS_CONFIG = 1; const std::vector IMS_CALL_DISCONNECT_REASONINFO_MAPPING_CONFIG = std::vector {}; const int32_t CARRIER_NR_AVAILABILITY_NSA = 1; diff --git a/interfaces/kits/js/@ohos.telephony.sim.d.ts b/interfaces/kits/js/@ohos.telephony.sim.d.ts index 6f53937ff..64ec2adca 100755 --- a/interfaces/kits/js/@ohos.telephony.sim.d.ts +++ b/interfaces/kits/js/@ohos.telephony.sim.d.ts @@ -3041,6 +3041,24 @@ declare namespace sim { * @since 10 */ KEY_BANDWIDTH_STRING_ARRAY = 'bandwidth_string_array', + + /** + * Indicates the emergency call list for with card. + * + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. + * @since 12 + */ + KEY_EMERGENCY_CALL_WITH_CARD_STRING_ARRAY = 'emergency_call_with_card_string_array', + + /** + * Indicates the emergency call list for no card. + * + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. + * @since 12 + */ + KEY_EMERGENCY_CALL_NO_CARD_STRING_ARRAY = 'emergency_call_no_card_string_array', } /** diff --git a/services/etc/carrier/operator_config.json b/services/etc/carrier/operator_config.json index adaa2c1b3..8f9cae85c 100644 --- a/services/etc/carrier/operator_config.json +++ b/services/etc/carrier/operator_config.json @@ -17,7 +17,8 @@ "spn_display_condition_cust_int": 1, "pnn_cust_string_array": [], "opl_cust_string_array": [], - "emergency_call_string_array": [], + "emergency_call_with_card_string_array": [], + "emergency_call_no_card_string_array": [], "bandwidth_source_use_modem_bool": true, "uplink_bandwidth_nr_nsa_use_lte_value_bool": false, "bandwidth_string_array": [],