openharmony/telephony_cellular_data
1
0
Fork 0
mirror of https://github.com/openharmony/telephony_cellular_data.git synced 2026-08-25 09:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix reviewboot and codex.

Browse Source 
Signed-off-by: dingxiaochen <dingxiaochen@huawei.com>
This commit is contained in:
dingxiaochen
2022-09-25 18:02:53 +08:00
parent 319218b789
commit ebc4fe67f0
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/js/napi/src/napi_cellular_data.cpp
+1 -1
View File
@@ -616,7 +616,7 @@ static napi_value GetDefaultCellularDataSlotIdSync(napi_env env, napi_callback_i
int32_t slotId = -1;
napi_get_cb_info(env, info, &parameterCount, parameters, &thisVar, &data);
if (parameterCount == 0) {
slotId = CellularDataClient::GetInstance().GetDefaultCellularDataSlotId();;
slotId = CellularDataClient::GetInstance().GetDefaultCellularDataSlotId();
}
napi_value value = nullptr;
NAPI_CALL(env, napi_create_int32(env, slotId, &value));
services/include/apn_manager/connection_retry_policy.h
-1
View File
@@ -36,7 +36,6 @@ public:
void InitialRetryCountValue();
private:
constexpr static const int64_t DEFAULT_DELAY_FOR_NEXT_APN = 2 * 1000;
std::vector<sptr<ApnItem>> matchedApns_;
mutable int32_t tryCount_ = 0;
int32_t maxCount_ = 5;
services/src/apn_manager/connection_retry_policy.cpp
+2
View File
@@ -19,6 +19,8 @@
namespace OHOS {
namespace Telephony {
constexpr static const int64_t DEFAULT_DELAY_FOR_NEXT_APN = 2 * 1000;
ConnectionRetryPolicy::ConnectionRetryPolicy() = default;
ConnectionRetryPolicy::~ConnectionRetryPolicy() = default;
services/src/cellular_data_handler.cpp
+14 -10
View File
@@ -1087,12 +1087,12 @@ void CellularDataHandler::SetDataPermitted(bool dataPermitted)
void CellularDataHandler::SetDataPermittedResponse(const AppExecFwk::InnerEvent::Pointer &event)
{
if (event == nullptr) {
TELEPHONY_LOGE("Slot%{public}d: event is null", slotId_);
TELEPHONY_LOGE("SetDataPermittedResponse:Slot%{public}d: event is null", slotId_);
return;
}
std::shared_ptr<TelRilResponseInfo<int32_t>> rilInfo = event->GetSharedObject<TelRilResponseInfo<int32_t>>();
if (rilInfo == nullptr) {
TELEPHONY_LOGE("Slot%{public}d: HRilRadioResponseInfo is null", slotId_);
TELEPHONY_LOGE("SetDataPermittedResponse:Slot%{public}d: HRilRadioResponseInfo is null", slotId_);
return;
}
if (rilInfo->errorNo != 0) {
@@ -1122,12 +1122,12 @@ void CellularDataHandler::SetRilAttachApn()
void CellularDataHandler::SetRilAttachApnResponse(const AppExecFwk::InnerEvent::Pointer &event)
{
if (event == nullptr) {
TELEPHONY_LOGE("Slot%{public}d: event is null", slotId_);
TELEPHONY_LOGE("SetRilAttachApnResponse:Slot%{public}d: event is null", slotId_);
return;
}
std::shared_ptr<TelRilResponseInfo<int32_t>> rilInfo = event->GetSharedObject<TelRilResponseInfo<int32_t>>();
if (rilInfo == nullptr) {
TELEPHONY_LOGE("Slot%{public}d: HRilRadioResponseInfo is null", slotId_);
TELEPHONY_LOGE("SetRilAttachApnResponse:Slot%{public}d: HRilRadioResponseInfo is null", slotId_);
return;
}
if (rilInfo->errorNo != 0) {
@@ -1364,12 +1364,13 @@ void CellularDataHandler::HandleDBSettingRoamingChanged(const AppExecFwk::InnerE
void CellularDataHandler::UnRegisterDataSettingObserver()
{
if (settingObserver_ == nullptr || roamingObserver_ == nullptr) {
TELEPHONY_LOGE("Slot%{public}d: settingObserver_ or roamingObserver_ is null", slotId_);
TELEPHONY_LOGE(
"UnRegisterDataSettingObserver:Slot%{public}d: settingObserver_ or roamingObserver_ is null", slotId_);
return;
}
std::shared_ptr<CellularDataSettingsRdbHelper> settingHelper = CellularDataSettingsRdbHelper::GetInstance();
if (settingHelper == nullptr) {
TELEPHONY_LOGE("Slot%{public}d: settingHelper is null", slotId_);
TELEPHONY_LOGE("UnRegisterDataSettingObserver:Slot%{public}d: settingHelper is null", slotId_);
return;
}
Uri dataEnableUri(CELLULAR_DATA_SETTING_DATA_ENABLE_URI);
@@ -1377,7 +1378,8 @@ void CellularDataHandler::UnRegisterDataSettingObserver()
int32_t simId = CoreManagerInner::GetInstance().GetSimId(slotId_);
if (simId <= INVALID_SIM_ID) {
TELEPHONY_LOGE("Slot%{public}d: failed due to invalid sim id %{public}d", slotId_, simId);
TELEPHONY_LOGE(
"UnRegisterDataSettingObserver:Slot%{public}d: failed due to invalid sim id %{public}d", slotId_, simId);
return;
}
Uri dataRoamingUri(std::string(CELLULAR_DATA_SETTING_DATA_ROAMING_URI) + std::to_string(simId));
@@ -1387,12 +1389,13 @@ void CellularDataHandler::UnRegisterDataSettingObserver()
void CellularDataHandler::RegisterDataSettingObserver()
{
if (settingObserver_ == nullptr || roamingObserver_ == nullptr) {
TELEPHONY_LOGE("Slot%{public}d: settingObserver_ or roamingObserver_ is null", slotId_);
TELEPHONY_LOGE(
"RegisterDataSettingObserver:Slot%{public}d: settingObserver_ or roamingObserver_ is null", slotId_);
return;
}
std::shared_ptr<CellularDataSettingsRdbHelper> settingHelper = CellularDataSettingsRdbHelper::GetInstance();
if (settingHelper == nullptr) {
TELEPHONY_LOGE("Slot%{public}d: settingHelper is null", slotId_);
TELEPHONY_LOGE("RegisterDataSettingObserver:Slot%{public}d: settingHelper is null", slotId_);
return;
}
Uri dataEnableUri(CELLULAR_DATA_SETTING_DATA_ENABLE_URI);
@@ -1400,7 +1403,8 @@ void CellularDataHandler::RegisterDataSettingObserver()
int32_t simId = CoreManagerInner::GetInstance().GetSimId(slotId_);
if (simId <= INVALID_SIM_ID) {
TELEPHONY_LOGE("Slot%{public}d: failed due to invalid sim id %{public}d", slotId_, simId);
TELEPHONY_LOGE(
"RegisterDataSettingObserver:Slot%{public}d: failed due to invalid sim id %{public}d", slotId_, simId);
return;
}
Uri dataRoamingUri(std::string(CELLULAR_DATA_SETTING_DATA_ROAMING_URI) + std::to_string(simId));