From ff0b77050d957450c77f88ae93236371842a1892 Mon Sep 17 00:00:00 2001 From: zhouoaoteng Date: Thu, 18 Jul 2024 14:39:57 +0800 Subject: [PATCH] code diff Signed-off-by: zhouoaoteng --- frameworks/native/backup_kit_inner/src/service_proxy.cpp | 2 +- .../backup_kit_inner/impl/i_service_ipc_interface_code.h | 2 +- interfaces/kits/js/backup/session_backup_n_exporter.cpp | 4 ++-- interfaces/kits/js/backup/session_restore_n_exporter.cpp | 4 ++-- services/backup_sa/src/module_ipc/service_stub.cpp | 4 ++-- tests/mock/module_ipc/service_stub_mock.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frameworks/native/backup_kit_inner/src/service_proxy.cpp b/frameworks/native/backup_kit_inner/src/service_proxy.cpp index d97cab19a..7385f6480 100644 --- a/frameworks/native/backup_kit_inner/src/service_proxy.cpp +++ b/frameworks/native/backup_kit_inner/src/service_proxy.cpp @@ -289,7 +289,7 @@ ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, const vectorSendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAILS), data, reply, + static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAIL), data, reply, option); if (ret != NO_ERROR) { string str = "Failed to send out the request because of " + to_string(ret); diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/i_service_ipc_interface_code.h b/interfaces/inner_api/native/backup_kit_inner/impl/i_service_ipc_interface_code.h index 1de4b9c45..d5b2f0406 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/i_service_ipc_interface_code.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/i_service_ipc_interface_code.h @@ -29,7 +29,7 @@ enum class IServiceInterfaceCode { SERVICE_CMD_START, SERVICE_CMD_GET_FILE_NAME, SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION, - SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAILS, + SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAIL, SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION, SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION_DETAILS, SERVICE_CMD_FINISH, diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index 0d84c0308..f053bac8e 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -368,7 +368,7 @@ napi_value SessionBackupNExporter::AppendBundles(napi_env env, napi_callback_inf napi_value SessionBackupNExporter::Release(napi_env env, napi_callback_info cbinfo) { - HILOGD("called SessionBackup::Release begin"); + HILOGI("called SessionBackup::Release begin"); NFuncArg funcArg(env, cbinfo); if (!funcArg.InitArgs(NARG_CNT::ZERO)) { HILOGE("Number of arguments unmatched."); @@ -393,7 +393,7 @@ napi_value SessionBackupNExporter::Release(napi_env env, napi_callback_info cbin return err ? NVal {env, err.GetNapiErr(env)} : NVal::CreateUndefined(env); }; - HILOGD("Called SessionBackup::Release end."); + HILOGI("Called SessionBackup::Release end."); NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index f5c6bc450..9a4d3156c 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -628,7 +628,7 @@ napi_value SessionRestoreNExporter::GetFileHandle(napi_env env, napi_callback_in napi_value SessionRestoreNExporter::Release(napi_env env, napi_callback_info cbinfo) { - HILOGD("called SessionRestore::Release begin"); + HILOGI("called SessionRestore::Release begin"); NFuncArg funcArg(env, cbinfo); if (!funcArg.InitArgs(NARG_CNT::ZERO)) { HILOGE("Number of arguments unmatched."); @@ -656,7 +656,7 @@ napi_value SessionRestoreNExporter::Release(napi_env env, napi_callback_info cbi return err ? NVal {env, err.GetNapiErr(env)} : NVal::CreateUndefined(env); }; - HILOGD("Called SessionRestore::Release end."); + HILOGI("Called SessionRestore::Release end."); NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; diff --git a/services/backup_sa/src/module_ipc/service_stub.cpp b/services/backup_sa/src/module_ipc/service_stub.cpp index 6a4dbe611..9a55824a0 100644 --- a/services/backup_sa/src/module_ipc/service_stub.cpp +++ b/services/backup_sa/src/module_ipc/service_stub.cpp @@ -75,8 +75,8 @@ ServiceStub::ServiceStub() &ServiceStub::CmdGetFileHandle; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION)] = &ServiceStub::CmdAppendBundlesRestoreSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAILS)] - = &ServiceStub::CmdAppendBundlesDetailsRestoreSession; + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAIL)] = + &ServiceStub::CmdAppendBundlesDetailsRestoreSession; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION)] = &ServiceStub::CmdAppendBundlesBackupSession; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION_DETAILS)] = diff --git a/tests/mock/module_ipc/service_stub_mock.cpp b/tests/mock/module_ipc/service_stub_mock.cpp index e143fd136..7a486a0ec 100644 --- a/tests/mock/module_ipc/service_stub_mock.cpp +++ b/tests/mock/module_ipc/service_stub_mock.cpp @@ -47,8 +47,8 @@ ServiceStub::ServiceStub() &ServiceStub::CmdGetFileHandle; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION)] = &ServiceStub::CmdAppendBundlesRestoreSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAILS)] - = &ServiceStub::CmdAppendBundlesDetailsRestoreSession; + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAIL)] = + &ServiceStub::CmdAppendBundlesDetailsRestoreSession; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION)] = &ServiceStub::CmdAppendBundlesBackupSession; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES_INCREMENTAL)] = -- Gitee