fix apn settings-telephony_cellular_data-AtomGit

Star3

Star3

已开启

fix apn settings #1292

zxh939426创建于 8月13日从zxh939426/telephony_cellular_data： master 合入到 openharmony/telephony_cellular_data： master

fix apn settings #1292

已开启

zxh939426创建于 8月13日

从zxh939426/telephony_cellular_data master合入到openharmony/telephony_cellular_data master

共 2 个文件变更+6-6

Mframeworks/js/napi/src/show_system_apn_settings.cpp+2-2

	@@ -223,7 +223,7 @@ napi_value ShowSystemApnSettings(napi_env env, napi_callback_info info)
223	TELEPHONY_LOGI("ShowSystemApnSettings slotId %{public}d isSimActive %{public}d", slotId, isSimActive);	223	TELEPHONY_LOGI("ShowSystemApnSettings slotId %{public}d isSimActive %{public}d", slotId, isSimActive);
224	if (!isSimActive) {	224	if (!isSimActive) {
225	napi_value result = WrapVoidToJs(env);	225	napi_value result = WrapVoidToJs(env);
226	- napi_value promise = SettingsInCompletePromise(env, asyncCallbackInfo.get(), result);	226	+ napi_value promise = SettingsCompletePromise(env, asyncCallbackInfo.get(), result);
227	return promise;	227	return promise;
228	}	228	}
229	OHOS::AAFwk::Want want;	229	OHOS::AAFwk::Want want;
	@@ -237,7 +237,7 @@ napi_value ShowSystemApnSettings(napi_env env, napi_callback_info info)
237		237
238	if (!StartUiExtensionAbility(want, loadProductContext)) {	238	if (!StartUiExtensionAbility(want, loadProductContext)) {
239	napi_value result = WrapVoidToJs(env);	239	napi_value result = WrapVoidToJs(env);
240	- napi_value promise = SettingsInCompletePromise(env, asyncCallbackInfo.get(), result);	240	+ napi_value promise = SettingsCompletePromise(env, asyncCallbackInfo.get(), result);
241	TELEPHONY_LOGE("ShowSystemApnSettings system internal error.");	241	TELEPHONY_LOGE("ShowSystemApnSettings system internal error.");
242	return promise;	242	return promise;
243	}	243	}

Mtest/apn_manager_test.cpp+4-4

	@@ -1119,10 +1119,10 @@ HWTEST_F(ApnManagerTest, ConvertPdpErrorToDisconnReason_002, TestSize.Level0)
1119	}	1119	}
1120		1120
1121	/**	1121	/**
1122	-@tc.number ConvertPdpErrorToDisconnReason_003	1122	+ * @tc.number ConvertPdpErrorToDisconnReason_003
1123	-@tc.name test function branch	1123	+ * @tc.name test function branch
1124	-@tc.desc Function test	1124	+ * @tc.desc Function test
1125	-*/	1125	+ */
1126	HWTEST_F(ApnManagerTest, ConvertPdpErrorToDisconnReason_003, TestSize.Level0)	1126	HWTEST_F(ApnManagerTest, ConvertPdpErrorToDisconnReason_003, TestSize.Level0)
1127	{	1127	{
1128	std::shared_ptr<ConnectionRetryPolicy> connectionRetryPolicy = std::make_shared<ConnectionRetryPolicy>();	1128	std::shared_ptr<ConnectionRetryPolicy> connectionRetryPolicy = std::make_shared<ConnectionRetryPolicy>();