From e49e43d7d015b41b25e5cef5b65267b6b6d3ff1b Mon Sep 17 00:00:00 2001 From: Far Date: Mon, 28 Mar 2022 19:33:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B9=E6=8D=AE=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 源码权限更改为644 2. 修复智能指针未判空就使用的问题 3. 将部分文件名修改得更易理解 Signed-off-by: Far --- BUILD.gn | 0 LICENSE | 0 README.md | 0 README_zh.md | 0 bundle.json | 0 ...=> state-registry-module.architecture.png} | Bin ...egistry-module.png => 状态注册-架构图.png} | Bin frameworks/js/napi/BUILD.gn | 0 frameworks/js/napi/include/event_listener.h | 0 .../js/napi/include/event_listener_handler.h | 0 .../js/napi/include/event_listener_manager.h | 10 ++++++-- .../js/napi/include/napi_state_registry.h | 0 .../js/napi/include/napi_telephony_observer.h | 0 .../include/telephony_callback_event_id.h | 0 .../include/telephony_update_event_type.h | 0 frameworks/js/napi/include/update_contexts.h | 0 frameworks/js/napi/include/update_infos.h | 4 ++-- .../js/napi/src/event_listener_handler.cpp | 11 ++++++--- .../js/napi/src/event_listener_manager.cpp | 22 ++++++++++++++---- .../js/napi/src/napi_state_registry.cpp | 4 ++-- .../js/napi/src/napi_telephony_observer.cpp | 12 +++++++++- frameworks/native/observer/BUILD.gn | 0 .../observer/include/telephony_observer.h | 4 ++-- .../include/telephony_observer_proxy.h | 0 .../include/telephony_state_manager.h | 0 .../observer/src/telephony_observer.cpp | 0 .../src/telephony_observer_client.cpp | 0 .../observer/src/telephony_observer_proxy.cpp | 0 .../observer/src/telephony_state_manager.cpp | 0 .../observer/telephony_observer_client.h | 0 .../kits/js/@ohos.telephony.observer.d.ts | 0 sa_profile/4009.xml | 0 sa_profile/BUILD.gn | 0 .../telephony_state_registry_dump_helper.h | 0 .../include/telephony_state_registry_record.h | 0 .../telephony_state_registry_service.h | 0 .../include/telephony_state_registry_stub.h | 0 .../telephony_state_registry_dump_helper.cpp | 14 +++++++---- .../src/telephony_state_registry_record.cpp | 0 .../src/telephony_state_registry_service.cpp | 4 +--- service/src/telephony_state_registry_stub.cpp | 0 test/BUILD.gn | 0 test/mock/BUILD.gn | 0 test/unittest/state_test/BUILD.gn | 0 .../state_test/state_registry_test.cpp | 2 ++ .../unittest/state_test/state_registry_test.h | 0 46 files changed, 64 insertions(+), 23 deletions(-) mode change 100755 => 100644 BUILD.gn mode change 100755 => 100644 LICENSE mode change 100755 => 100644 README.md mode change 100755 => 100644 README_zh.md mode change 100755 => 100644 bundle.json rename figures/{en-us-architecture-of-the-state-registry-module.png => state-registry-module.architecture.png} (100%) mode change 100755 => 100644 rename figures/{zh-cn-architecture-of-the-state-registry-module.png => 状态注册-架构图.png} (100%) mode change 100755 => 100644 mode change 100755 => 100644 frameworks/js/napi/BUILD.gn mode change 100755 => 100644 frameworks/js/napi/include/event_listener.h mode change 100755 => 100644 frameworks/js/napi/include/event_listener_handler.h mode change 100755 => 100644 frameworks/js/napi/include/event_listener_manager.h mode change 100755 => 100644 frameworks/js/napi/include/napi_state_registry.h mode change 100755 => 100644 frameworks/js/napi/include/napi_telephony_observer.h mode change 100755 => 100644 frameworks/js/napi/include/telephony_callback_event_id.h mode change 100755 => 100644 frameworks/js/napi/include/telephony_update_event_type.h mode change 100755 => 100644 frameworks/js/napi/include/update_contexts.h mode change 100755 => 100644 frameworks/js/napi/include/update_infos.h mode change 100755 => 100644 frameworks/js/napi/src/event_listener_handler.cpp mode change 100755 => 100644 frameworks/js/napi/src/event_listener_manager.cpp mode change 100755 => 100644 frameworks/js/napi/src/napi_state_registry.cpp mode change 100755 => 100644 frameworks/js/napi/src/napi_telephony_observer.cpp mode change 100755 => 100644 frameworks/native/observer/BUILD.gn mode change 100755 => 100644 frameworks/native/observer/include/telephony_observer.h mode change 100755 => 100644 frameworks/native/observer/include/telephony_observer_proxy.h mode change 100755 => 100644 frameworks/native/observer/include/telephony_state_manager.h mode change 100755 => 100644 frameworks/native/observer/src/telephony_observer.cpp mode change 100755 => 100644 frameworks/native/observer/src/telephony_observer_client.cpp mode change 100755 => 100644 frameworks/native/observer/src/telephony_observer_proxy.cpp mode change 100755 => 100644 frameworks/native/observer/src/telephony_state_manager.cpp mode change 100755 => 100644 interfaces/innerkits/observer/telephony_observer_client.h mode change 100755 => 100644 interfaces/kits/js/@ohos.telephony.observer.d.ts mode change 100755 => 100644 sa_profile/4009.xml mode change 100755 => 100644 sa_profile/BUILD.gn mode change 100755 => 100644 service/include/telephony_state_registry_dump_helper.h mode change 100755 => 100644 service/include/telephony_state_registry_record.h mode change 100755 => 100644 service/include/telephony_state_registry_service.h mode change 100755 => 100644 service/include/telephony_state_registry_stub.h mode change 100755 => 100644 service/src/telephony_state_registry_dump_helper.cpp mode change 100755 => 100644 service/src/telephony_state_registry_record.cpp mode change 100755 => 100644 service/src/telephony_state_registry_service.cpp mode change 100755 => 100644 service/src/telephony_state_registry_stub.cpp mode change 100755 => 100644 test/BUILD.gn mode change 100755 => 100644 test/mock/BUILD.gn mode change 100755 => 100644 test/unittest/state_test/BUILD.gn mode change 100755 => 100644 test/unittest/state_test/state_registry_test.cpp mode change 100755 => 100644 test/unittest/state_test/state_registry_test.h diff --git a/BUILD.gn b/BUILD.gn old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/README_zh.md b/README_zh.md old mode 100755 new mode 100644 diff --git a/bundle.json b/bundle.json old mode 100755 new mode 100644 diff --git a/figures/en-us-architecture-of-the-state-registry-module.png b/figures/state-registry-module.architecture.png old mode 100755 new mode 100644 similarity index 100% rename from figures/en-us-architecture-of-the-state-registry-module.png rename to figures/state-registry-module.architecture.png diff --git a/figures/zh-cn-architecture-of-the-state-registry-module.png b/figures/状态注册-架构图.png old mode 100755 new mode 100644 similarity index 100% rename from figures/zh-cn-architecture-of-the-state-registry-module.png rename to figures/状态注册-架构图.png diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn old mode 100755 new mode 100644 diff --git a/frameworks/js/napi/include/event_listener.h b/frameworks/js/napi/include/event_listener.h old mode 100755 new mode 100644 diff --git a/frameworks/js/napi/include/event_listener_handler.h b/frameworks/js/napi/include/event_listener_handler.h old mode 100755 new mode 100644 diff --git a/frameworks/js/napi/include/event_listener_manager.h b/frameworks/js/napi/include/event_listener_manager.h old mode 100755 new mode 100644 index 794f1ed..4248302 --- a/frameworks/js/napi/include/event_listener_manager.h +++ b/frameworks/js/napi/include/event_listener_manager.h @@ -22,6 +22,7 @@ #include "event_listener.h" #include "event_listener_handler.h" #include "telephony_update_event_type.h" +#include "telephony_log_wrapper.h" namespace OHOS { namespace Telephony { @@ -30,7 +31,12 @@ public: template inline static bool SendEvent(uint32_t innerEventId, std::unique_ptr &object, int64_t delayTime = 0) { - return DelayedSingleton::GetInstance()->SendEvent(innerEventId, object, delayTime); + auto handler = DelayedSingleton::GetInstance(); + if (handler == nullptr) { + TELEPHONY_LOGE("Get handler failed"); + return false; + } + return handler->SendEvent(innerEventId, object, delayTime); } static std::optional RegisterEventListener(EventListener &eventListener); static std::optional UnregisterEventListener(int32_t slotId, const TelephonyUpdateEventType eventType); @@ -38,4 +44,4 @@ public: }; } // namespace Telephony } // namespace OHOS -#endif // EVENT_LISTENER_MANAGER_H \ No newline at end of file +#endif // EVENT_LISTENER_MANAGER_H diff --git a/frameworks/js/napi/include/napi_state_registry.h b/frameworks/js/napi/include/napi_state_registry.h old mode 100755 new mode 100644 diff --git a/frameworks/js/napi/include/napi_telephony_observer.h b/frameworks/js/napi/include/napi_telephony_observer.h old mode 100755 new mode 100644 diff --git a/frameworks/js/napi/include/telephony_callback_event_id.h b/frameworks/js/napi/include/telephony_callback_event_id.h old mode 100755 new mode 100644 diff --git a/frameworks/js/napi/include/telephony_update_event_type.h b/frameworks/js/napi/include/telephony_update_event_type.h old mode 100755 new mode 100644 diff --git a/frameworks/js/napi/include/update_contexts.h b/frameworks/js/napi/include/update_contexts.h old mode 100755 new mode 100644 diff --git a/frameworks/js/napi/include/update_infos.h b/frameworks/js/napi/include/update_infos.h old mode 100755 new mode 100644 index a480f21..cba0e47 --- a/frameworks/js/napi/include/update_infos.h +++ b/frameworks/js/napi/include/update_infos.h @@ -30,7 +30,7 @@ namespace OHOS { namespace Telephony { struct UpdateInfo { int32_t slotId_ = 0; - UpdateInfo(int32_t slotId) : slotId_(slotId) {} + explicit UpdateInfo(int32_t slotId) : slotId_(slotId) {} }; struct CallStateUpdateInfo : public UpdateInfo { @@ -83,4 +83,4 @@ struct CellularDataFlowUpdate : public UpdateInfo { }; } // namespace Telephony } // namespace OHOS -#endif // UPDATE_INFOS_H \ No newline at end of file +#endif // UPDATE_INFOS_H diff --git a/frameworks/js/napi/src/event_listener_handler.cpp b/frameworks/js/napi/src/event_listener_handler.cpp old mode 100755 new mode 100644 index 3b9e21c..4d02996 --- a/frameworks/js/napi/src/event_listener_handler.cpp +++ b/frameworks/js/napi/src/event_listener_handler.cpp @@ -122,7 +122,12 @@ napi_status NapiReturnToJS(napi_env env, napi_ref callbackRef, napi_value callba if (status != napi_ok) { TELEPHONY_LOGE("NapiReturnToJS napi_call_function return error : %{public}d", status); } - DelayedSingleton::GetInstance()->SetCallbackCompleteToListener(callbackRef); + auto handler = DelayedSingleton::GetInstance(); + if (handler == nullptr) { + TELEPHONY_LOGE("Get event handler failed"); + return status; + } + handler->SetCallbackCompleteToListener(callbackRef); return status; } @@ -342,7 +347,7 @@ void EventListenerHandler::RemoveListener(TelephonyUpdateEventType eventType) if (listener.env != nullptr && listener.callbackRef != nullptr) { napi_delete_reference(listener.env, listener.callbackRef); } - }; + } return matched; }); } @@ -544,4 +549,4 @@ void EventListenerHandler::WorkCellularDataFlowUpdate(uv_work_t *work, int statu NapiReturnToJS(dataFlowInfo->env, dataFlowInfo->callbackRef, callbackValue); } } // namespace Telephony -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/frameworks/js/napi/src/event_listener_manager.cpp b/frameworks/js/napi/src/event_listener_manager.cpp old mode 100755 new mode 100644 index e542a2f..5369a9c --- a/frameworks/js/napi/src/event_listener_manager.cpp +++ b/frameworks/js/napi/src/event_listener_manager.cpp @@ -20,18 +20,32 @@ namespace OHOS { namespace Telephony { std::optional EventListenerManager::RegisterEventListener(EventListener &eventListener) { - return DelayedSingleton::GetInstance()->RegisterEventListener(eventListener); + auto handler = DelayedSingleton::GetInstance(); + if (handler == nullptr) { + TELEPHONY_LOGE("Get event handler failed"); + return std::nullopt; + } + return handler->RegisterEventListener(eventListener); } std::optional EventListenerManager::UnregisterEventListener( int32_t slotId, const TelephonyUpdateEventType eventType) { - return DelayedSingleton::GetInstance()->UnregisterEventListener(slotId, eventType); + auto handler = DelayedSingleton::GetInstance(); + if (handler == nullptr) { + TELEPHONY_LOGE("Get event handler failed"); + return std::nullopt; + } + return handler->UnregisterEventListener(slotId, eventType); } void EventListenerManager::RemoveListener(TelephonyUpdateEventType eventType) { - DelayedSingleton::GetInstance()->RemoveListener(eventType); + auto handler = DelayedSingleton::GetInstance(); + if (handler == nullptr) { + TELEPHONY_LOGE("Get event handler failed"); + } + handler->RemoveListener(eventType); } } // namespace Telephony -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/frameworks/js/napi/src/napi_state_registry.cpp b/frameworks/js/napi/src/napi_state_registry.cpp old mode 100755 new mode 100644 index 8265537..53361f1 --- a/frameworks/js/napi/src/napi_state_registry.cpp +++ b/frameworks/js/napi/src/napi_state_registry.cpp @@ -197,8 +197,8 @@ static napi_module _stateRegistryModule = { .nm_filename = nullptr, .nm_register_func = InitNapiStateRegistry, .nm_modname = "telephony.observer", - .nm_priv = ((void *)0), - .reserved = {(void *)0}, + .nm_priv = nullptr, + .reserved = {nullptr}, }; extern "C" __attribute__((constructor)) void RegisterTelephonyObserverModule(void) diff --git a/frameworks/js/napi/src/napi_telephony_observer.cpp b/frameworks/js/napi/src/napi_telephony_observer.cpp old mode 100755 new mode 100644 index 48736a3..da5af4c --- a/frameworks/js/napi/src/napi_telephony_observer.cpp +++ b/frameworks/js/napi/src/napi_telephony_observer.cpp @@ -26,6 +26,10 @@ void NapiTelephonyObserver::OnCallStateUpdated(int32_t slotId, int32_t callState TELEPHONY_LOGI("OnCallStateUpdated slotId = %{public}d, callState = %{public}d", slotId, callState); std::unique_ptr callStateInfo = std::make_unique(slotId, callState, phoneNumber); + if (callStateInfo == nullptr) { + TELEPHONY_LOGE("callStateInfo is nullptr!"); + return; + } EventListenerManager::SendEvent(ToUint32t(TelephonyCallbackEventId::EVENT_ON_CALL_STATE_UPDATE), callStateInfo); } @@ -37,6 +41,7 @@ void NapiTelephonyObserver::OnSignalInfoUpdated( std::unique_ptr infoList = std::make_unique(slotId, signalInfoList); if (infoList == nullptr) { TELEPHONY_LOGE("SignalUpdateInfo is nullptr!"); + return; } EventListenerManager::SendEvent(ToUint32t(TelephonyCallbackEventId::EVENT_ON_SIGNAL_INFO_UPDATE), infoList); } @@ -49,6 +54,7 @@ void NapiTelephonyObserver::OnNetworkStateUpdated(int32_t slotId, const sptr(slotId, networkState); if (networkStateUpdateInfo == nullptr) { TELEPHONY_LOGE("NetworkStateUpdateInfo is nullptr!"); + return; } EventListenerManager::SendEvent( ToUint32t(TelephonyCallbackEventId::EVENT_ON_NETWORK_STATE_UPDATE), networkStateUpdateInfo); @@ -62,6 +68,7 @@ void NapiTelephonyObserver::OnSimStateUpdated( std::make_unique(slotId, type, state, reason); if (simStateUpdateInfo == nullptr) { TELEPHONY_LOGE("SimStateUpdateInfo is nullptr!"); + return; } EventListenerManager::SendEvent( ToUint32t(TelephonyCallbackEventId::EVENT_ON_SIM_STATE_UPDATE), simStateUpdateInfo); @@ -73,6 +80,7 @@ void NapiTelephonyObserver::OnCellInfoUpdated(int32_t slotId, const std::vector< std::unique_ptr cellInfo = std::make_unique(slotId, vec); if (cellInfo == nullptr) { TELEPHONY_LOGE("CellInfomationUpdate is nullptr!"); + return; } EventListenerManager::SendEvent(ToUint32t(TelephonyCallbackEventId::EVENT_ON_CELL_INFOMATION_UPDATE), cellInfo); } @@ -88,6 +96,7 @@ void NapiTelephonyObserver::OnCellularDataConnectStateUpdated( std::make_unique(slotId, dataState, networkType); if (cellularDataConnectState == nullptr) { TELEPHONY_LOGE("OnCellularDataConnectStateUpdated cellularDataConnectState is nullptr!"); + return; } EventListenerManager::SendEvent( ToUint32t(TelephonyCallbackEventId::EVENT_ON_CELLULAR_DATA_CONNECTION_UPDATE), cellularDataConnectState); @@ -101,9 +110,10 @@ void NapiTelephonyObserver::OnCellularDataFlowUpdated(int32_t slotId, int32_t da std::make_unique(slotId, dataFlowType); if (cellularDataFlowUpdateInfo == nullptr) { TELEPHONY_LOGE("CellularDataFlowUpdate is nullptr!"); + return; } EventListenerManager::SendEvent( ToUint32t(TelephonyCallbackEventId::EVENT_ON_CELLULAR_DATA_FLOW_UPDATE), cellularDataFlowUpdateInfo); } } // namespace Telephony -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/frameworks/native/observer/BUILD.gn b/frameworks/native/observer/BUILD.gn old mode 100755 new mode 100644 diff --git a/frameworks/native/observer/include/telephony_observer.h b/frameworks/native/observer/include/telephony_observer.h old mode 100755 new mode 100644 index 796bd16..d5f70ca --- a/frameworks/native/observer/include/telephony_observer.h +++ b/frameworks/native/observer/include/telephony_observer.h @@ -28,8 +28,8 @@ namespace OHOS { namespace Telephony { class TelephonyObserver : public IRemoteStub { public: - TelephonyObserver() {}; - ~TelephonyObserver() {}; + TelephonyObserver() {} + ~TelephonyObserver() {} virtual void OnCallStateUpdated( int32_t slotId, int32_t callState, const std::u16string &phoneNumber) override; virtual void OnSignalInfoUpdated( diff --git a/frameworks/native/observer/include/telephony_observer_proxy.h b/frameworks/native/observer/include/telephony_observer_proxy.h old mode 100755 new mode 100644 diff --git a/frameworks/native/observer/include/telephony_state_manager.h b/frameworks/native/observer/include/telephony_state_manager.h old mode 100755 new mode 100644 diff --git a/frameworks/native/observer/src/telephony_observer.cpp b/frameworks/native/observer/src/telephony_observer.cpp old mode 100755 new mode 100644 diff --git a/frameworks/native/observer/src/telephony_observer_client.cpp b/frameworks/native/observer/src/telephony_observer_client.cpp old mode 100755 new mode 100644 diff --git a/frameworks/native/observer/src/telephony_observer_proxy.cpp b/frameworks/native/observer/src/telephony_observer_proxy.cpp old mode 100755 new mode 100644 diff --git a/frameworks/native/observer/src/telephony_state_manager.cpp b/frameworks/native/observer/src/telephony_state_manager.cpp old mode 100755 new mode 100644 diff --git a/interfaces/innerkits/observer/telephony_observer_client.h b/interfaces/innerkits/observer/telephony_observer_client.h old mode 100755 new mode 100644 diff --git a/interfaces/kits/js/@ohos.telephony.observer.d.ts b/interfaces/kits/js/@ohos.telephony.observer.d.ts old mode 100755 new mode 100644 diff --git a/sa_profile/4009.xml b/sa_profile/4009.xml old mode 100755 new mode 100644 diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn old mode 100755 new mode 100644 diff --git a/service/include/telephony_state_registry_dump_helper.h b/service/include/telephony_state_registry_dump_helper.h old mode 100755 new mode 100644 diff --git a/service/include/telephony_state_registry_record.h b/service/include/telephony_state_registry_record.h old mode 100755 new mode 100644 diff --git a/service/include/telephony_state_registry_service.h b/service/include/telephony_state_registry_service.h old mode 100755 new mode 100644 diff --git a/service/include/telephony_state_registry_stub.h b/service/include/telephony_state_registry_stub.h old mode 100755 new mode 100644 diff --git a/service/src/telephony_state_registry_dump_helper.cpp b/service/src/telephony_state_registry_dump_helper.cpp old mode 100755 new mode 100644 index 359157d..f4bb11d --- a/service/src/telephony_state_registry_dump_helper.cpp +++ b/service/src/telephony_state_registry_dump_helper.cpp @@ -58,19 +58,25 @@ bool TelephonyStateRegistryDumpHelper::ShowTelephonyStateRegistryInfo( result.append("\n"); } } + std::shared_ptr service = + DelayedSingleton::GetInstance(); + if (service == nullptr) { + TELEPHONY_LOGE("Get state registry service failed"); + return false; + } result.append("BindStartTime: "); result.append( - DelayedSingleton::GetInstance()->GetBindStartTime()); + service->GetBindStartTime()); result.append("\n"); result.append("BindEndTime: "); result.append( - DelayedSingleton::GetInstance()->GetBindEndTime()); + service->GetBindEndTime()); result.append("\n"); result.append("BindSpendTime: "); result.append( - DelayedSingleton::GetInstance()->GetBindSpendTime()); + service->GetBindSpendTime()); result.append("\n"); return true; } } // namespace Telephony -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/service/src/telephony_state_registry_record.cpp b/service/src/telephony_state_registry_record.cpp old mode 100755 new mode 100644 diff --git a/service/src/telephony_state_registry_service.cpp b/service/src/telephony_state_registry_service.cpp old mode 100755 new mode 100644 index 25c5cfc..b5573ed --- a/service/src/telephony_state_registry_service.cpp +++ b/service/src/telephony_state_registry_service.cpp @@ -283,7 +283,6 @@ int32_t TelephonyStateRegistryService::RegisterStateChange( return TELEPHONY_STATE_REGISTRY_PERMISSION_DENIED; } std::lock_guard guard(lock_); - int32_t result = TELEPHONY_STATE_REGISTRY_DATA_NOT_EXIST; bool isExist = false; TelephonyStateRegistryRecord record; for (size_t i = 0; i < stateRecords_.size(); i++) { @@ -301,7 +300,6 @@ int32_t TelephonyStateRegistryService::RegisterStateChange( record.bundleName_ = bundleName; record.telephonyObserver_ = telephonyObserver; stateRecords_.push_back(record); - result = TELEPHONY_SUCCESS; } if (isUpdate && VerifySlotId(slotId)) { @@ -564,4 +562,4 @@ std::string TelephonyStateRegistryService::GetBindSpendTime() return oss.str(); } } // namespace Telephony -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/service/src/telephony_state_registry_stub.cpp b/service/src/telephony_state_registry_stub.cpp old mode 100755 new mode 100644 diff --git a/test/BUILD.gn b/test/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/mock/BUILD.gn b/test/mock/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/unittest/state_test/BUILD.gn b/test/unittest/state_test/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/unittest/state_test/state_registry_test.cpp b/test/unittest/state_test/state_registry_test.cpp old mode 100755 new mode 100644 index 5813de2..b1b9797 --- a/test/unittest/state_test/state_registry_test.cpp +++ b/test/unittest/state_test/state_registry_test.cpp @@ -76,6 +76,7 @@ void StateRegistryTest::UpdateSignalInfo() std::unique_ptr signal = std::make_unique(); if (signal == nullptr) { TELEPHONY_LOGE("SignalInformation is nullptr\n"); + return; } vec.push_back(signal.release()); DelayedRefSingleton::GetInstance(). @@ -115,6 +116,7 @@ void StateRegistryTest::UpdateNetworkState() std::unique_ptr networkState = std::make_unique(); if (networkState == nullptr) { TELEPHONY_LOGE("NetworkState is nullptr\n"); + return; } DelayedRefSingleton::GetInstance(). UpdateNetworkState(slotId, networkState.release()); diff --git a/test/unittest/state_test/state_registry_test.h b/test/unittest/state_test/state_registry_test.h old mode 100755 new mode 100644