openharmony/telephony_cellular_data
1
0
Fork 0
mirror of https://gitee.com/openharmony/telephony_cellular_data synced 2024-11-23 07:49:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!592 updataNetworkInfo in event handler

Browse Source 
Merge pull request !592 from 罗堡文/master
This commit is contained in:
openharmony_ci 2024-06-04 07:41:45 +00:00 committed by Gitee
commit 830aa3d65e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/include/cellular_data_handler.h
View File

@ -74,6 +74,7 @@ public:
void RegisterDataSettingObserver();
void UnRegisterDataSettingObserver();
int32_t GetIntelligenceSwitchState(bool &switchState);
void HandleUpdateNetInfo(const AppExecFwk::InnerEvent::Pointer &event);
private:
std::shared_ptr<CellularDataStateMachine> CreateCellularDataConnect();
@ -204,6 +205,7 @@ private:
{ RadioEvent::RADIO_RIL_ADAPTER_HOST_DIED, &CellularDataHandler::OnRilAdapterHostDied },
{ RadioEvent::RADIO_FACTORY_RESET, &CellularDataHandler::HandleFactoryReset },
{ RadioEvent::RADIO_CLEAN_ALL_DATA_CONNECTIONS, &CellularDataHandler::OnCleanAllDataConnectionsDone },
{ CellularDataEventCode::MSG_DATA_CALL_LIST_CHANGED, &CellularDataHandler::HandleUpdateNetInfo },
};
};
} // namespace Telephony

1
services/include/common/cellular_data_event_code.h
View File

@ -66,6 +66,7 @@ public:
static const uint32_t MSG_SM_INCALL_DATA_DSDS_CHANGED = BASE + 39;
static const uint32_t MSG_INCALL_DATA_COMPLETE = BASE + 40;
static const uint32_t MSG_SM_RIL_ADAPTER_HOST_DIED = BASE + 41;
static const uint32_t MSG_DATA_CALL_LIST_CHANGED = BASE + 42;
};
} // namespace Telephony
} // namespace OHOS

1
services/include/state_machine/cellular_data_state_machine.h
View File

@ -65,6 +65,7 @@ public:
void SetConnectionBandwidth(const uint32_t upBandwidth, const uint32_t downBandwidth);
void SetConnectionTcpBuffer(const std::string &tcpBuffer);
void SplitProxyIpAddress(const std::string &proxyIpAddress, std::string &host, uint16_t &port);
bool UpdateNetworkInfoInHandler(SetupDataCallResultInfo &info);
protected:
sptr<State> activeState_;

22
services/src/cellular_data_handler.cpp
View File

@ -2092,6 +2092,28 @@ std::shared_ptr<CellularDataStateMachine> CellularDataHandler::CheckForCompatibl
return potentialDc;
}
void CellularDataHandler::HandleUpdateNetInfo(const AppExecFwk::InnerEvent::Pointer &event)
{
TELEPHONY_LOGI("Slot%{public}d: receive HandleUpdateNetInfo event", slotId_);
std::shared_ptr<SetupDataCallResultInfo> info = event->GetSharedObject<SetupDataCallResultInfo>();
if (connectionManager_ == nullptr) {
TELEPHONY_LOGE("Slot%{public}d: connectionManager is null", slotId_);
return;
}
if (info == nullptr) {
TELEPHONY_LOGE("Info is null");
return;
}
std::shared_ptr<CellularDataStateMachine> dataConnect = connectionManager_->GetActiveConnectionByCid(info->cid);
if (dataConnect == nullptr) {
TELEPHONY_LOGE("get active connection by cid is := %{public}d flag:= %{public}d ", info->cid, info->flag);
return;
}
dataConnect->UpdateNetworkInfo(*info);
}
bool CellularDataHandler::IsGsm()
{
bool isGsm = false;

5
services/src/data_connection_manager.cpp
View File

@ -278,7 +278,10 @@ void CcmDefaultState::UpdateNetworkInfo(const AppExecFwk::InnerEvent::Pointer &e
TELEPHONY_LOGE("get active connection by cid is := %{public}d flag:= %{public}d ", it.cid, it.flag);
continue;
}
dataConnect->UpdateNetworkInfo(it);
if (!dataConnect->UpdateNetworkInfoInHandler(it)) {
TELEPHONY_LOGW("Update in handler failed cid %{public}d flag %{public}d ", it.cid, it.flag);
dataConnect->UpdateNetworkInfo(it);
}
}
}

10
services/src/state_machine/cellular_data_state_machine.cpp
View File

@ -427,5 +427,15 @@ void CellularDataStateMachine::SetConnectionTcpBuffer(const std::string &tcpBuff
{
tcpBuffer_ = tcpBuffer;
}
bool CellularDataStateMachine::UpdateNetworkInfoInHandler(SetupDataCallResultInfo &info)
{
if (!cellularDataHandler_) {
TELEPHONY_LOGE("cellularDataHandler is null!");
return false;
}
auto netInfo = std::make_shared<SetupDataCallResultInfo>(info);
return cellularDataHandler_->SendEvent(CellularDataEventCode::MSG_DATA_CALL_LIST_CHANGED, netInfo);
}
} // namespace Telephony
} // namespace OHOS