diff --git a/interfaces/inner_api/connect_server_manager/include/connect_server_manager.h b/interfaces/inner_api/connect_server_manager/include/connect_server_manager.h index 1e956d20ce..9e533e1a02 100644 --- a/interfaces/inner_api/connect_server_manager/include/connect_server_manager.h +++ b/interfaces/inner_api/connect_server_manager/include/connect_server_manager.h @@ -47,8 +47,7 @@ public: int32_t tid, int32_t instanceId, const std::string& instanceName = "PandaDebugger"); void StoreDebuggerInfo(int32_t tid, void* vm, const panda::JSNApi::DebugOption& debugOption, const DebuggerPostTask& debuggerPostTask, bool isDebugApp); - void SetSwitchCallback(const std::function &setSwitchStatus, - const std::function &createLayoutInfo, int32_t instanceId); + void SetSwitchCallback(const std::function &createLayoutInfo, int32_t instanceId); void SetProfilerCallBack(const std::function &setStateProfilerStatus); void SetConnectedCallback(); bool SendInstanceMessage(int32_t tid, int32_t instanceId, const std::string& instanceName); diff --git a/interfaces/inner_api/connect_server_manager/src/connect_server_manager.cpp b/interfaces/inner_api/connect_server_manager/src/connect_server_manager.cpp index 7df4413e83..746a8e8f3e 100644 --- a/interfaces/inner_api/connect_server_manager/src/connect_server_manager.cpp +++ b/interfaces/inner_api/connect_server_manager/src/connect_server_manager.cpp @@ -49,8 +49,7 @@ using SendMessage = void (*)(const std::string&); using StopServer = void (*)(const std::string&); using StoreMessage = void (*)(int32_t, const std::string&); using SetProfilerCallback = void (*)(const std::function &setStateProfilerStatus); -using SetSwitchCallBack = void (*)(const std::function &setSwitchStatus, - const std::function &createLayoutInfo, int32_t instanceId); +using SetSwitchCallBack = void (*)(const std::function &createLayoutInfo, int32_t instanceId); using SetConnectCallback = void (*)(const std::function); using RemoveMessage = void (*)(int32_t); using WaitForConnection = bool (*)(); @@ -205,8 +204,7 @@ void ConnectServerManager::SetConnectedCallback() }); } -void ConnectServerManager::SetSwitchCallback(const std::function &setSwitchStatus, - const std::function &createLayoutInfo, int32_t instanceId) +void ConnectServerManager::SetSwitchCallback(const std::function &createLayoutInfo, int32_t instanceId) { LoadConnectServerDebuggerSo(); auto setSwitchCallBack = reinterpret_cast( @@ -215,7 +213,7 @@ void ConnectServerManager::SetSwitchCallback(const std::function &se TAG_LOGE(AAFwkTag::JSRUNTIME, "null setSwitchCallBack"); return; } - setSwitchCallBack(setSwitchStatus, createLayoutInfo, instanceId); + setSwitchCallBack(createLayoutInfo, instanceId); } void ConnectServerManager::SetProfilerCallBack(const std::function &setStateProfilerStatus) diff --git a/test/unittest/connect_server_manager_test/connect_server_manager_test.cpp b/test/unittest/connect_server_manager_test/connect_server_manager_test.cpp index da0441aa93..7487a658cf 100644 --- a/test/unittest/connect_server_manager_test/connect_server_manager_test.cpp +++ b/test/unittest/connect_server_manager_test/connect_server_manager_test.cpp @@ -219,11 +219,10 @@ HWTEST_F(ConnectServerManagerTest, GetDebuggerPostTaskTest_0100, TestSize.Level1 { TAG_LOGI(AAFwkTag::TEST, "GetDebuggerPostTaskTest_0100 is start"); auto setStateProfilerStatus = [](bool) {}; - auto setSwitchStatus = [](bool) {}; auto createLayoutInfo = [](int32_t) {}; int32_t instanceId = 1; ConnectServerManager &connectServerManager = AbilityRuntime::ConnectServerManager::Get(); - connectServerManager.SetSwitchCallback(setSwitchStatus, createLayoutInfo, instanceId); + connectServerManager.SetSwitchCallback(createLayoutInfo, instanceId); connectServerManager.SetProfilerCallBack(setStateProfilerStatus); int32_t tid = 1; EXPECT_EQ(connectServerManager.GetDebuggerPostTask(tid), nullptr);