openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-27 01:10:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!6991 修复attach调试崩溃问题

Browse Source 
Merge pull request !6991 from xinking129/master
This commit is contained in:
openharmony_ci 2023-11-27 02:34:05 +00:00 committed by Gitee
commit 48a8584dee
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
19 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interfaces/inner_api/ability_manager/include/ability_manager_interface.h
View File

@ -1286,14 +1286,14 @@ public:
* @param listener App debug listener.
* @return Returns ERR_OK on success, others on failure.
*/
virtual int32_t RegisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener) = 0;
virtual int32_t RegisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener) = 0;
/**
* @brief Unregister app debug listener.
* @param listener App debug listener.
* @return Returns ERR_OK on success, others on failure.
*/
virtual int32_t UnregisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener) = 0;
virtual int32_t UnregisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener) = 0;
/**
* @brief Attach app debug.

4
services/abilitymgr/include/ability_manager_proxy.h
View File

@ -1018,14 +1018,14 @@ public:
* @param listener App debug listener.
* @return Returns ERR_OK on success, others on failure.
*/
int32_t RegisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener) override;
int32_t RegisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener) override;
/**
* @brief Unregister app debug listener.
* @param listener App debug listener.
* @return Returns ERR_OK on success, others on failure.
*/
int32_t UnregisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener) override;
int32_t UnregisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener) override;
/**
* @brief Attach app debug.

4
services/abilitymgr/include/ability_manager_service.h
View File

@ -1330,14 +1330,14 @@ public:
* @param listener App debug listener.
* @return Returns ERR_OK on success, others on failure.
*/
int32_t RegisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener) override;
int32_t RegisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener) override;
/**
* @brief Unregister app debug listener.
* @param listener App debug listener.
* @return Returns ERR_OK on success, others on failure.
*/
int32_t UnregisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener) override;
int32_t UnregisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener) override;
/**
* @brief Attach app debug.

4
services/abilitymgr/src/ability_manager_proxy.cpp
View File

@ -4440,7 +4440,7 @@ int AbilityManagerProxy::PrepareTerminateAbilityBySCB(const sptr<SessionInfo> &s
return NO_ERROR;
}
int32_t AbilityManagerProxy::RegisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener)
int32_t AbilityManagerProxy::RegisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener)
{
HILOG_DEBUG("Called.");
MessageParcel data;
@ -4464,7 +4464,7 @@ int32_t AbilityManagerProxy::RegisterAppDebugListener(const sptr<AppExecFwk::IAp
return reply.ReadInt32();
}
int32_t AbilityManagerProxy::UnregisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener)
int32_t AbilityManagerProxy::UnregisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener)
{
HILOG_DEBUG("Called.");
MessageParcel data;

4
services/abilitymgr/src/ability_manager_service.cpp
View File

@ -8829,7 +8829,7 @@ bool AbilityManagerService::CheckUserIdActive(int32_t userId)
return true;
}
int32_t AbilityManagerService::RegisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener)
int32_t AbilityManagerService::RegisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener)
{
HILOG_DEBUG("Called.");
if (!AAFwk::PermissionVerification::GetInstance()->IsSACall()) {
@ -8839,7 +8839,7 @@ int32_t AbilityManagerService::RegisterAppDebugListener(const sptr<AppExecFwk::I
return DelayedSingleton<AppScheduler>::GetInstance()->RegisterAppDebugListener(listener);
}
int32_t AbilityManagerService::UnregisterAppDebugListener(const sptr<AppExecFwk::IAppDebugListener> &listener)
int32_t AbilityManagerService::UnregisterAppDebugListener(sptr<AppExecFwk::IAppDebugListener> listener)
{
HILOG_DEBUG("Called.");
if (!AAFwk::PermissionVerification::GetInstance()->IsSACall()) {

4
test/mock/frameworks_kits_ability_ability_runtime_test/AMS/mock_serviceability_manager_service.h
View File

@ -324,8 +324,8 @@ public:
commonMockResultFlag_ = flag;
}
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_service.h
View File

@ -291,8 +291,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

8
test/mock/frameworks_kits_appkit_native_test/ability_delegator/mock_ability_delegator_stub.h
View File

@ -173,8 +173,8 @@ public:
void CompleteFirstFrameDrawing(const sptr<IRemoteObject>& abilityToken) override {}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,
@ -340,8 +340,8 @@ public:
void CompleteFirstFrameDrawing(const sptr<IRemoteObject>& abilityToken) override {}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
test/mock/frameworks_kits_appkit_test/include/mock_ability_mgr_service.h
View File

@ -125,8 +125,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
test/mock/frameworks_kits_test/AMS/mock_ability_manager_service.h
View File

@ -281,8 +281,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
test/mock/frameworks_kits_test/AMS/mock_serviceability_manager_service.h
View File

@ -297,8 +297,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
test/moduletest/mock/include/mock_ability_mgr_service.h
View File

@ -263,8 +263,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
test/unittest/ability_manager_client_branch_test/ability_manager_stub_mock_test.h
View File

@ -417,8 +417,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
test/unittest/ability_manager_proxy_test/ability_manager_stub_mock.h
View File

@ -402,8 +402,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(IsAbilityControllerStart, bool(const Want& want));

4
test/unittest/ability_manager_stub_test/ability_manager_stub_impl_mock.h
View File

@ -402,8 +402,8 @@ public:
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD2(PrepareTerminateAbilityBySCB, int32_t(const sptr<SessionInfo> &sessionInfo, bool &isPrepareTerminate));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(IsAbilityControllerStart, bool(const Want& want));

4
test/unittest/ability_manager_test/ability_manager_stub_mock.h
View File

@ -403,8 +403,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
test/unittest/service_extension_context_test/ability_manager_stub_mock.h
View File

@ -394,8 +394,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
test/unittest/sys_mgr_client_test/mock_ability_manager_service.h
View File

@ -271,8 +271,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,

4
tools/test/mock/mock_ability_manager_stub.h
View File

@ -273,8 +273,8 @@ public:
}
#endif
MOCK_METHOD2(IsValidMissionIds, int32_t(const std::vector<int32_t>&, std::vector<MissionValidResult>&));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(const sptr<AppExecFwk::IAppDebugListener> &listener));
MOCK_METHOD1(RegisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(UnregisterAppDebugListener, int32_t(sptr<AppExecFwk::IAppDebugListener> listener));
MOCK_METHOD1(AttachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD1(DetachAppDebug, int32_t(const std::string &bundleName));
MOCK_METHOD3(ExecuteIntent, int32_t(uint64_t key, const sptr<IRemoteObject> &callerToken,