diff --git a/services/zidl/src/power_mode_callback_stub.cpp b/services/zidl/src/power_mode_callback_stub.cpp index 42adae2912f41f223a5e559a8a14b35f60fff63e..7dcef583812206de6cc5637902902c2d543944bb 100644 --- a/services/zidl/src/power_mode_callback_stub.cpp +++ b/services/zidl/src/power_mode_callback_stub.cpp @@ -29,7 +29,7 @@ namespace OHOS { namespace PowerMgr { int PowerModeCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) - { +{ POWER_HILOGD(COMP_SVC, "cmd = %{public}d, flags= %{public}d", code, option.GetFlags()); const int DFX_DELAY_S = 10; int id = HiviewDFX::XCollie::GetInstance().SetTimer("PowerModeCallbackStub", DFX_DELAY_S, nullptr, nullptr, @@ -38,6 +38,7 @@ int PowerModeCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel& data, M std::u16string remoteDescripter = data.ReadInterfaceToken(); if (descripter != remoteDescripter) { POWER_HILOGE(COMP_SVC, "Descriptor is not match"); + HiviewDFX::XCollie::GetInstance().CancelTimer(id); return E_GET_POWER_SERVICE_FAILED; } diff --git a/services/zidl/src/power_runninglock_callback_stub.cpp b/services/zidl/src/power_runninglock_callback_stub.cpp index 8dd6c201d9c4abec2cab6665fff9c4b364acb837..74f78c94a82a8713ae326ce1dcf613619fcf4196 100644 --- a/services/zidl/src/power_runninglock_callback_stub.cpp +++ b/services/zidl/src/power_runninglock_callback_stub.cpp @@ -35,6 +35,7 @@ int PowerRunningLockCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel & std::u16string remoteDescripter = data.ReadInterfaceToken(); if (descripter != remoteDescripter) { POWER_HILOGE(COMP_SVC, "Descriptor is not match"); + HiviewDFX::XCollie::GetInstance().CancelTimer(id); return E_GET_POWER_SERVICE_FAILED; } diff --git a/services/zidl/src/power_state_callback_stub.cpp b/services/zidl/src/power_state_callback_stub.cpp index 546e9bb8540b93df7e86f69f8b30d40d7a21874e..b1c988384ba98be03a6eb1271233a6f92849d131 100644 --- a/services/zidl/src/power_state_callback_stub.cpp +++ b/services/zidl/src/power_state_callback_stub.cpp @@ -35,6 +35,7 @@ int PowerStateCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, std::u16string remoteDescripter = data.ReadInterfaceToken(); if (descripter != remoteDescripter) { POWER_HILOGE(COMP_SVC, "Descriptor is not match"); + HiviewDFX::XCollie::GetInstance().CancelTimer(id); return E_GET_POWER_SERVICE_FAILED; } diff --git a/services/zidl/src/screen_off_pre_callback_stub.cpp b/services/zidl/src/screen_off_pre_callback_stub.cpp index eae77bf2844992c3c57e7344d778463b36ea1c4c..08a0465c77d50fe6b7d3f58460c7913b30a0d770 100644 --- a/services/zidl/src/screen_off_pre_callback_stub.cpp +++ b/services/zidl/src/screen_off_pre_callback_stub.cpp @@ -35,6 +35,7 @@ int ScreenOffPreCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data std::u16string remoteDescripter = data.ReadInterfaceToken(); if (descripter != remoteDescripter) { POWER_HILOGE(COMP_SVC, "Descriptor is not match"); + HiviewDFX::XCollie::GetInstance().CancelTimer(id); return E_GET_POWER_SERVICE_FAILED; } diff --git a/services/zidl/src/shutdown/async_shutdown_callback_stub.cpp b/services/zidl/src/shutdown/async_shutdown_callback_stub.cpp index e4d242c36be4161e3a0269add31c4ba43b969a08..150626bed9b9b01a44047648d6f540e183156e57 100644 --- a/services/zidl/src/shutdown/async_shutdown_callback_stub.cpp +++ b/services/zidl/src/shutdown/async_shutdown_callback_stub.cpp @@ -34,6 +34,7 @@ int AsyncShutdownCallbackStub::OnRemoteRequest( std::u16string remoteDescripter = data.ReadInterfaceToken(); if (descripter != remoteDescripter) { POWER_HILOGE(COMP_SVC, "Descriptor is not match"); + HiviewDFX::XCollie::GetInstance().CancelTimer(id); return E_GET_POWER_SERVICE_FAILED; } diff --git a/services/zidl/src/shutdown/sync_shutdown_callback_stub.cpp b/services/zidl/src/shutdown/sync_shutdown_callback_stub.cpp index 896422514672f614e88aaa31a6fb1e91dfe9e74a..02efa829eb85d3f8084001f265b98cacc815ed49 100644 --- a/services/zidl/src/shutdown/sync_shutdown_callback_stub.cpp +++ b/services/zidl/src/shutdown/sync_shutdown_callback_stub.cpp @@ -34,6 +34,7 @@ int SyncShutdownCallbackStub::OnRemoteRequest( std::u16string remoteDescripter = data.ReadInterfaceToken(); if (descripter != remoteDescripter) { POWER_HILOGE(COMP_SVC, "Descriptor is not match"); + HiviewDFX::XCollie::GetInstance().CancelTimer(id); return E_GET_POWER_SERVICE_FAILED; } diff --git a/services/zidl/src/shutdown/takeover_shutdown_callback_stub.cpp b/services/zidl/src/shutdown/takeover_shutdown_callback_stub.cpp index 4d73de5af1d00f3dd677da205c7ee42af4bd1459..a96965d9860658e9d3ea8c2f11ec4060a2474df4 100644 --- a/services/zidl/src/shutdown/takeover_shutdown_callback_stub.cpp +++ b/services/zidl/src/shutdown/takeover_shutdown_callback_stub.cpp @@ -34,6 +34,7 @@ int TakeOverShutdownCallbackStub::OnRemoteRequest( std::u16string remoteDescripter = data.ReadInterfaceToken(); if (descripter != remoteDescripter) { POWER_HILOGE(COMP_SVC, "Descriptor is not match"); + HiviewDFX::XCollie::GetInstance().CancelTimer(id); return E_GET_POWER_SERVICE_FAILED; } diff --git a/services/zidl/src/sync_hibernate_callback_stub.cpp b/services/zidl/src/sync_hibernate_callback_stub.cpp index 2162f00126d80e8c8e8b2d9a9e72e27390d8c47c..9992f5c9e9b23ecd47659b2003d6ba6a7819833e 100644 --- a/services/zidl/src/sync_hibernate_callback_stub.cpp +++ b/services/zidl/src/sync_hibernate_callback_stub.cpp @@ -35,6 +35,7 @@ int SyncHibernateCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &dat std::u16string remoteDescripter = data.ReadInterfaceToken(); if (descripter != remoteDescripter) { POWER_HILOGE(COMP_SVC, "Descriptor is not match"); + HiviewDFX::XCollie::GetInstance().CancelTimer(id); return E_GET_POWER_SERVICE_FAILED; } diff --git a/services/zidl/src/sync_sleep_callback_stub.cpp b/services/zidl/src/sync_sleep_callback_stub.cpp index 3d1a59a03e7f45df0576e46811efddcf86c3610e..f64ca6a16b5e5b84426e94cbdebe63b260fd1696 100644 --- a/services/zidl/src/sync_sleep_callback_stub.cpp +++ b/services/zidl/src/sync_sleep_callback_stub.cpp @@ -35,6 +35,7 @@ int SyncSleepCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, M std::u16string remoteDescripter = data.ReadInterfaceToken(); if (descripter != remoteDescripter) { POWER_HILOGE(COMP_SVC, "Descriptor is not match"); + HiviewDFX::XCollie::GetInstance().CancelTimer(id); return E_GET_POWER_SERVICE_FAILED; }