openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve redefinition for ability_runtime

Browse Source 
Signed-off-by: 黄师伟 <huangshiwei4@huawei.com>
This commit is contained in:
黄师伟
2022-07-27 11:09:42 +08:00
parent 012892393d
commit bec67bfe2b
5 changed files with 12 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/mock/services_abilitymgr_test/libs/appexecfwk_core/include/appmgr/app_mgr_client.h
+3 -3
View File
@@ -13,8 +13,8 @@
* limitations under the License.
*/
#ifndef MOCK_OHOS_ABILITY_RUNTIME_APP_MGR_CLIENT_H
#define MOCK_OHOS_ABILITY_RUNTIME_APP_MGR_CLIENT_H
#ifndef OHOS_ABILITY_RUNTIME_APP_MGR_CLIENT_H
#define OHOS_ABILITY_RUNTIME_APP_MGR_CLIENT_H
#include "iremote_object.h"
#include "refbase.h"
@@ -173,4 +173,4 @@ private:
};
} // namespace AppExecFwk
} // namespace OHOS
#endif // MOCK_OHOS_ABILITY_RUNTIME_APP_MGR_CLIENT_H
#endif // OHOS_ABILITY_RUNTIME_APP_MGR_CLIENT_H
test/mock/services_abilitymgr_test/libs/appexecfwk_core/include/appmgr/app_mgr_interface.h
+3 -3
View File
@@ -13,8 +13,8 @@
* limitations under the License.
*/
#ifndef MOCK_OHOS_ABILITY_RUNTIME_APP_MGR_INTERFACE_H
#define MOCK_OHOS_ABILITY_RUNTIME_APP_MGR_INTERFACE_H
#ifndef OHOS_ABILITY_RUNTIME_APP_MGR_INTERFACE_H
#define OHOS_ABILITY_RUNTIME_APP_MGR_INTERFACE_H
#include "iremote_broker.h"
#include "iremote_object.h"
@@ -155,4 +155,4 @@ public:
} // namespace AppExecFwk
} // namespace OHOS
#endif // MOCK_OHOS_ABILITY_RUNTIME_APP_MGR_INTERFACE_H
#endif // OHOS_ABILITY_RUNTIME_APP_MGR_INTERFACE_H
test/mock/services_abilitymgr_test/libs/appexecfwk_core/include/appmgr/app_process_data.h
+3 -3
View File
@@ -13,8 +13,8 @@
* limitations under the License.
*/
#ifndef MOCK_OHOS_ABILITY_RUNTIME_APP_PROCESS_DATA_H
#define MOCK_OHOS_ABILITY_RUNTIME_APP_PROCESS_DATA_H
#ifndef OHOS_ABILITY_RUNTIME_APP_PROCESS_DATA_H
#define OHOS_ABILITY_RUNTIME_APP_PROCESS_DATA_H
#include <sys/types.h>
#include "parcel.h"
@@ -53,4 +53,4 @@ struct AppProcessData : public Parcelable {
};
} // namespace AppExecFwk
} // namespace OHOS
#endif // MOCK_OHOS_ABILITY_RUNTIME_APP_PROCESS_DATA_H
#endif // OHOS_ABILITY_RUNTIME_APP_PROCESS_DATA_H
test/mock/services_abilitymgr_test/libs/appexecfwk_core/include/appmgr/app_state_callback_host.h
+3 -3
View File
@@ -13,8 +13,8 @@
* limitations under the License.
*/
#ifndef MOCK_OHOS_ABILITY_RUNTIME_APP_STATE_CALLBACK_HOST_H
#define MOCK_OHOS_ABILITY_RUNTIME_APP_STATE_CALLBACK_HOST_H
#ifndef OHOS_ABILITY_RUNTIME_APP_STATE_CALLBACK_HOST_H
#define OHOS_ABILITY_RUNTIME_APP_STATE_CALLBACK_HOST_H
#include <map>
#include "iremote_stub.h"
@@ -60,4 +60,4 @@ private:
};
} // namespace AppExecFwk
} // namespace OHOS
#endif // MOCK_OHOS_ABILITY_RUNTIME_APP_STATE_CALLBACK_HOST_H
#endif // OHOS_ABILITY_RUNTIME_APP_STATE_CALLBACK_HOST_H
test/mock/services_abilitymgr_test/libs/appexecfwk_core/include/appmgr/iapp_state_callback.h
-53
View File
@@ -1,53 +0,0 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef MOCK_OHOS_ABILITY_RUNTIME_IAPP_STATE_CALLBACK_H
#define MOCK_OHOS_ABILITY_RUNTIME_IAPP_STATE_CALLBACK_H
#include "iremote_broker.h"
#include "iremote_object.h"
#include "app_mgr_constants.h"
#include "app_process_data.h"
namespace OHOS {
namespace AppExecFwk {
class IAppStateCallback : public IRemoteBroker {
public:
DECLARE_INTERFACE_DESCRIPTOR(u"ohos.appexecfwk.AppStateCallback");
/**
* Application state changed callback.
*
* @param appProcessData Process data
*/
virtual void OnAppStateChanged(const AppProcessData &appProcessData) = 0;
/**
* AbilityMgr's request is done.
*
* @param token Ability token.
* @param state Application state.
*/
virtual void OnAbilityRequestDone(const sptr<IRemoteObject> &token, const AbilityState state) = 0;
enum class Message {
TRANSACT_ON_APP_STATE_CHANGED = 0,
TRANSACT_ON_ABILITY_REQUEST_DONE,
};
};
} // namespace AppExecFwk
} // namespace OHOS
#endif // MOCK_OHOS_ABILITY_RUNTIME_IAPP_STATE_CALLBACK_H