From 9325617674e3da96ddd751ff096bea35ca97a111 Mon Sep 17 00:00:00 2001 From: AXYChen Date: Thu, 26 Dec 2024 11:50:10 +0800 Subject: [PATCH] appStateData Signed-off-by: AXYChen Change-Id: Ie65e1d5178b914264133deb8be9a7db63f04adf8 --- services/accesstokenmanager/BUILD.gn | 1 + .../include/permission/short_grant_manager.h | 2 +- .../permission/temp_permission_observer.h | 6 +- .../src/permission/short_grant_manager.cpp | 4 +- .../permission/temp_permission_observer.cpp | 14 ++--- services/common/BUILD.gn | 2 +- services/common/app_manager/BUILD.gn | 3 +- .../include/app_manager_access_client.h | 2 +- .../include/app_manager_access_proxy.h | 12 ++-- .../app_manager/include/app_state_data.h | 60 ------------------- .../include/app_status_change_callback.h | 6 +- .../src/app_manager_access_client.cpp | 2 +- .../src/app_manager_access_proxy.cpp | 4 +- .../common/app_manager/src/app_state_data.cpp | 53 ---------------- .../src/app_status_change_callback.cpp | 6 +- services/privacymanager/BUILD.gn | 1 + .../record/permission_record_manager.h | 4 +- .../src/record/permission_record_manager.cpp | 12 ++-- 18 files changed, 42 insertions(+), 152 deletions(-) delete mode 100644 services/common/app_manager/include/app_state_data.h delete mode 100644 services/common/app_manager/src/app_state_data.cpp diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index 8a9b77466..a639f9b8e 100644 --- a/services/accesstokenmanager/BUILD.gn +++ b/services/accesstokenmanager/BUILD.gn @@ -147,6 +147,7 @@ if (is_standard_system) { "relational_store:native_rdb", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "ability_runtime:app_manager", ] if (ohos_indep_compiler_enable) { diff --git a/services/accesstokenmanager/main/cpp/include/permission/short_grant_manager.h b/services/accesstokenmanager/main/cpp/include/permission/short_grant_manager.h index 8289d7d8f..c07b3826f 100644 --- a/services/accesstokenmanager/main/cpp/include/permission/short_grant_manager.h +++ b/services/accesstokenmanager/main/cpp/include/permission/short_grant_manager.h @@ -46,7 +46,7 @@ public: ShortPermAppStateObserver() = default; ~ShortPermAppStateObserver() = default; - void OnAppStopped(const AppStateData &appStateData) override; + void OnAppStopped(const AppExecFwk::AppStateData &appStateData) override; DISALLOW_COPY_AND_MOVE(ShortPermAppStateObserver); }; diff --git a/services/accesstokenmanager/main/cpp/include/permission/temp_permission_observer.h b/services/accesstokenmanager/main/cpp/include/permission/temp_permission_observer.h index 124a43bfa..ac20917fc 100644 --- a/services/accesstokenmanager/main/cpp/include/permission/temp_permission_observer.h +++ b/services/accesstokenmanager/main/cpp/include/permission/temp_permission_observer.h @@ -41,9 +41,9 @@ public: PermissionAppStateObserver() = default; ~PermissionAppStateObserver() = default; - void OnAppStopped(const AppStateData &appStateData) override; - void OnAppStateChanged(const AppStateData &appStateData) override; - void OnAppCacheStateChanged(const AppStateData &appStateData) override; + void OnAppStopped(const AppExecFwk::AppStateData &appStateData) override; + void OnAppStateChanged(const AppExecFwk::AppStateData &appStateData) override; + void OnAppCacheStateChanged(const AppExecFwk::AppStateData &appStateData) override; DISALLOW_COPY_AND_MOVE(PermissionAppStateObserver); }; diff --git a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp index b6204f5de..9ff0f82e3 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp @@ -56,9 +56,9 @@ void ShortPermAppManagerDeathCallback::NotifyAppManagerDeath() ShortGrantManager::GetInstance().OnAppMgrRemoteDiedHandle(); } -void ShortPermAppStateObserver::OnAppStopped(const AppStateData &appStateData) +void ShortPermAppStateObserver::OnAppStopped(const AppExecFwk::AppStateData &appStateData) { - if (appStateData.state == static_cast(ApplicationState::APP_STATE_TERMINATED)) { + if (appStateData.state == static_cast(AppExecFwk::ApplicationFlag::APP_STATE_TERMINATED)) { uint32_t tokenID = appStateData.accessTokenId; ACCESSTOKEN_LOG_INFO(LABEL, "TokenID:%{public}d died.", tokenID); diff --git a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp index 3f62ade57..5db4384d2 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp @@ -66,7 +66,7 @@ TempPermissionObserver& TempPermissionObserver::GetInstance() return *instance; } -void PermissionAppStateObserver::OnAppStateChanged(const AppStateData &appStateData) +void PermissionAppStateObserver::OnAppStateChanged(const AppExecFwk::AppStateData &appStateData) { uint32_t tokenID = appStateData.accessTokenId; std::vector list; @@ -75,11 +75,11 @@ void PermissionAppStateObserver::OnAppStateChanged(const AppStateData &appStateD return; } ACCESSTOKEN_LOG_INFO(LABEL, "OnChange(accessTokenId=%{public}d, state=%{public}d)", tokenID, appStateData.state); - if (appStateData.state == static_cast(ApplicationState::APP_STATE_FOREGROUND)) { + if (appStateData.state == static_cast(AppExecFwk::ApplicationFlag::APP_STATE_FOREGROUND)) { TempPermissionObserver::GetInstance().ModifyAppState(tokenID, FOREGROUND_FLAG, true); std::string taskName = TASK_NAME_TEMP_PERMISSION + std::to_string(tokenID); TempPermissionObserver::GetInstance().CancleTaskOfPermissionRevoking(taskName); - } else if (appStateData.state == static_cast(ApplicationState::APP_STATE_BACKGROUND)) { + } else if (appStateData.state == static_cast(AppExecFwk::ApplicationFlag::APP_STATE_BACKGROUND)) { TempPermissionObserver::GetInstance().ModifyAppState(tokenID, FOREGROUND_FLAG, false); if (list[FORMS_FLAG]) { ACCESSTOKEN_LOG_WARN(LABEL, "%{public}d:tokenID has form, don't delayRevokePermission!", tokenID); @@ -94,9 +94,9 @@ void PermissionAppStateObserver::OnAppStateChanged(const AppStateData &appStateD } } -void PermissionAppStateObserver::OnAppStopped(const AppStateData &appStateData) +void PermissionAppStateObserver::OnAppStopped(const AppExecFwk::AppStateData &appStateData) { - if (appStateData.state == static_cast(ApplicationState::APP_STATE_TERMINATED)) { + if (appStateData.state == static_cast(AppExecFwk::ApplicationFlag::APP_STATE_TERMINATED)) { uint32_t tokenID = appStateData.accessTokenId; ACCESSTOKEN_LOG_INFO(LABEL, "TokenID:%{public}d died.", tokenID); // cancle task when process die @@ -106,7 +106,7 @@ void PermissionAppStateObserver::OnAppStopped(const AppStateData &appStateData) } } -void PermissionAppStateObserver::OnAppCacheStateChanged(const AppStateData &appStateData) +void PermissionAppStateObserver::OnAppCacheStateChanged(const AppExecFwk::AppStateData &appStateData) { uint32_t tokenID = appStateData.accessTokenId; ACCESSTOKEN_LOG_INFO(LABEL, "TokenID is %{public}d, state is %{public}d.", tokenID, appStateData.state); @@ -442,7 +442,7 @@ bool TempPermissionObserver::CheckPermissionState(AccessTokenID tokenID, const std::string& permissionName, const std::string& bundleName) { bool isForeground = false; - std::vector foreGroundAppList; + std::vector foreGroundAppList; AppManagerAccessClient::GetInstance().GetForegroundApplications(foreGroundAppList); if (std::any_of(foreGroundAppList.begin(), foreGroundAppList.end(), [tokenID](const auto& foreGroundApp) { return foreGroundApp.accessTokenId == tokenID; })) { diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index 57a3a997c..5098da94d 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -48,7 +48,6 @@ ohos_static_library("accesstoken_service_common") { "app_manager/src/app_manager_access_client.cpp", "app_manager/src/app_manager_access_proxy.cpp", "app_manager/src/app_manager_death_recipient.cpp", - "app_manager/src/app_state_data.cpp", "app_manager/src/app_status_change_callback.cpp", "app_manager/src/process_data.cpp", "database/src/generic_values.cpp", @@ -70,6 +69,7 @@ ohos_static_library("accesstoken_service_common") { ] external_deps = [ + "ability_runtime:app_state_data", "c_utils:utils", "hilog:libhilog", "ipc:ipc_single", diff --git a/services/common/app_manager/BUILD.gn b/services/common/app_manager/BUILD.gn index d1db269b8..cf42d6d35 100644 --- a/services/common/app_manager/BUILD.gn +++ b/services/common/app_manager/BUILD.gn @@ -37,7 +37,6 @@ ohos_shared_library("accesstoken_app_manager") { "src/app_manager_access_client.cpp", "src/app_manager_access_proxy.cpp", "src/app_manager_death_recipient.cpp", - "src/app_state_data.cpp", "src/app_status_change_callback.cpp", "src/process_data.cpp", ] @@ -49,6 +48,8 @@ ohos_shared_library("accesstoken_app_manager") { ] external_deps = [ + "ability_runtime:app_state_data", + "ability_base:want", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", diff --git a/services/common/app_manager/include/app_manager_access_client.h b/services/common/app_manager/include/app_manager_access_client.h index 385987855..ceeeb7f14 100644 --- a/services/common/app_manager/include/app_manager_access_client.h +++ b/services/common/app_manager/include/app_manager_access_client.h @@ -36,7 +36,7 @@ public: int32_t KillProcessesByAccessTokenId(const uint32_t accessTokenId); int32_t RegisterApplicationStateObserver(const sptr& observer); int32_t UnregisterApplicationStateObserver(const sptr& observer); - int32_t GetForegroundApplications(std::vector& list); + int32_t GetForegroundApplications(std::vector& list); void RegisterDeathCallback(const std::shared_ptr& callback); void OnRemoteDiedHandle(); diff --git a/services/common/app_manager/include/app_manager_access_proxy.h b/services/common/app_manager/include/app_manager_access_proxy.h index b17c0275e..158e97756 100644 --- a/services/common/app_manager/include/app_manager_access_proxy.h +++ b/services/common/app_manager/include/app_manager_access_proxy.h @@ -19,7 +19,7 @@ #include #include "ams_manager_access_proxy.h" -#include "app_state_data.h" +#include "appmgr/app_state_data.h" #include "process_data.h" namespace OHOS { @@ -31,9 +31,9 @@ public: virtual void OnProcessStateChanged(const ProcessData &processData) = 0; virtual void OnProcessDied(const ProcessData &processData) = 0; - virtual void OnAppStateChanged(const AppStateData &appStateData) = 0; - virtual void OnAppStopped(const AppStateData &appStateData) = 0; - virtual void OnAppCacheStateChanged(const AppStateData &appStateData) = 0; + virtual void OnAppStateChanged(const AppExecFwk::AppStateData &appStateData) = 0; + virtual void OnAppStopped(const AppExecFwk::AppStateData &appStateData) = 0; + virtual void OnAppCacheStateChanged(const AppExecFwk::AppStateData &appStateData) = 0; enum class Message { TRANSACT_ON_PROCESS_STATE_CHANGED = 4, @@ -52,7 +52,7 @@ public: virtual int32_t RegisterApplicationStateObserver(const sptr& observer, const std::vector& bundleNameList = {}) = 0; virtual int32_t UnregisterApplicationStateObserver(const sptr& observer) = 0; - virtual int32_t GetForegroundApplications(std::vector& list) = 0; + virtual int32_t GetForegroundApplications(std::vector& list) = 0; enum class Message { APP_GET_MGR_INSTANCE = 6, @@ -72,7 +72,7 @@ public: int32_t RegisterApplicationStateObserver(const sptr& observer, const std::vector &bundleNameList = {}) override; int32_t UnregisterApplicationStateObserver(const sptr& observer) override; - int32_t GetForegroundApplications(std::vector& list) override; + int32_t GetForegroundApplications(std::vector& list) override; private: static inline BrokerDelegator delegator_; }; diff --git a/services/common/app_manager/include/app_state_data.h b/services/common/app_manager/include/app_state_data.h deleted file mode 100644 index e8d352330..000000000 --- a/services/common/app_manager/include/app_state_data.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2022 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 ACCESS_APP_STATE_DATA_H -#define ACCESS_APP_STATE_DATA_H - -#include - -#include "parcel.h" -#include "iremote_object.h" - -namespace OHOS { -namespace Security { -namespace AccessToken { -enum class ApplicationState { - APP_STATE_BEGIN = 0, - APP_STATE_CREATE = APP_STATE_BEGIN, - APP_STATE_READY, - APP_STATE_FOREGROUND, - APP_STATE_FOCUS, - APP_STATE_BACKGROUND, - APP_STATE_TERMINATED, - APP_STATE_END, -}; -struct AppStateData : public Parcelable { - virtual bool Marshalling(Parcel &parcel) const override; - static AppStateData *Unmarshalling(Parcel &parcel); - - std::string bundleName; - int32_t pid = -1; - int32_t uid = 0; - int32_t state = 0; - uint32_t accessTokenId = 0; - bool isFocused = false; - int32_t extensionType = 255; - std::vector renderPids; - std::string callerBundleName; - bool isSplitScreenMode = false; - bool isFloatingWindowMode = false; - bool isSpecifyTokenId = false; - int32_t appIndex = 0; - bool isPreloadModule = false; -}; -} // namespace AccessToken -} // namespace Security -} // namespace OHOS - -#endif // ACCESS_APP_STATE_DATA_H diff --git a/services/common/app_manager/include/app_status_change_callback.h b/services/common/app_manager/include/app_status_change_callback.h index df6734b6d..87b42181b 100644 --- a/services/common/app_manager/include/app_status_change_callback.h +++ b/services/common/app_manager/include/app_status_change_callback.h @@ -34,9 +34,9 @@ public: virtual void OnProcessStateChanged(const ProcessData &processData) override {} virtual void OnProcessDied(const ProcessData &processData) override {} - virtual void OnAppStateChanged(const AppStateData &appStateData) override {} - virtual void OnAppStopped(const AppStateData &appStateData) override {} - virtual void OnAppCacheStateChanged(const AppStateData &appStateData) override {} + virtual void OnAppStateChanged(const AppExecFwk::AppStateData &appStateData) override {} + virtual void OnAppStopped(const AppExecFwk::AppStateData &appStateData) override {} + virtual void OnAppCacheStateChanged(const AppExecFwk::AppStateData &appStateData) override {} DISALLOW_COPY_AND_MOVE(ApplicationStateObserverStub); private: diff --git a/services/common/app_manager/src/app_manager_access_client.cpp b/services/common/app_manager/src/app_manager_access_client.cpp index ed3118ad5..48ad9cf9c 100644 --- a/services/common/app_manager/src/app_manager_access_client.cpp +++ b/services/common/app_manager/src/app_manager_access_client.cpp @@ -97,7 +97,7 @@ int32_t AppManagerAccessClient::UnregisterApplicationStateObserver(const sptrUnregisterApplicationStateObserver(observer); } -int32_t AppManagerAccessClient::GetForegroundApplications(std::vector& list) +int32_t AppManagerAccessClient::GetForegroundApplications(std::vector& list) { auto proxy = GetProxy(); if (proxy == nullptr) { diff --git a/services/common/app_manager/src/app_manager_access_proxy.cpp b/services/common/app_manager/src/app_manager_access_proxy.cpp index 6ccb979d9..3b09355c3 100644 --- a/services/common/app_manager/src/app_manager_access_proxy.cpp +++ b/services/common/app_manager/src/app_manager_access_proxy.cpp @@ -113,7 +113,7 @@ int32_t AppManagerAccessProxy::UnregisterApplicationStateObserver( return reply.ReadInt32(); } -int32_t AppManagerAccessProxy::GetForegroundApplications(std::vector& list) +int32_t AppManagerAccessProxy::GetForegroundApplications(std::vector& list) { MessageParcel data; MessageParcel reply; @@ -139,7 +139,7 @@ int32_t AppManagerAccessProxy::GetForegroundApplications(std::vector info(reply.ReadParcelable()); + std::unique_ptr info(reply.ReadParcelable()); if (info != nullptr) { list.emplace_back(*info); } diff --git a/services/common/app_manager/src/app_state_data.cpp b/services/common/app_manager/src/app_state_data.cpp deleted file mode 100644 index 48d3bd556..000000000 --- a/services/common/app_manager/src/app_state_data.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2022 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. - */ - -#include "app_state_data.h" - -namespace OHOS { -namespace Security { -namespace AccessToken { -bool AppStateData::Marshalling(Parcel &parcel) const -{ - return (parcel.WriteString(bundleName) && parcel.WriteInt32(uid) && parcel.WriteInt32(state) - && parcel.WriteInt32(pid) && parcel.WriteUint32(accessTokenId) && parcel.WriteBool(isFocused) - && parcel.WriteInt32(extensionType) && parcel.WriteInt32Vector(renderPids) - && parcel.WriteString(callerBundleName) && parcel.WriteBool(isSplitScreenMode) - && parcel.WriteBool(isFloatingWindowMode) && parcel.WriteInt32(appIndex) && parcel.WriteBool(isPreloadModule)); -} - -AppStateData *AppStateData::Unmarshalling(Parcel &parcel) -{ - AppStateData *appStateData = new (std::nothrow) AppStateData(); - if (appStateData == nullptr) { - return nullptr; - } - appStateData->bundleName = parcel.ReadString(); - appStateData->uid = parcel.ReadInt32(); - appStateData->state = parcel.ReadInt32(); - appStateData->pid = parcel.ReadInt32(); - appStateData->accessTokenId = parcel.ReadUint32(); - appStateData->isFocused = parcel.ReadBool(); - appStateData->extensionType = parcel.ReadInt32(); - parcel.ReadInt32Vector(&appStateData->renderPids); - appStateData->callerBundleName = parcel.ReadString(); - appStateData->isSplitScreenMode = parcel.ReadBool(); - appStateData->isFloatingWindowMode = parcel.ReadBool(); - appStateData->appIndex = parcel.ReadInt32(); - appStateData->isPreloadModule = parcel.ReadBool(); - return appStateData; -} -} // namespace AccessToken -} // namespace Security -} // namespace OHOS diff --git a/services/common/app_manager/src/app_status_change_callback.cpp b/services/common/app_manager/src/app_status_change_callback.cpp index b25caf1b6..dda68fd42 100644 --- a/services/common/app_manager/src/app_status_change_callback.cpp +++ b/services/common/app_manager/src/app_status_change_callback.cpp @@ -98,7 +98,7 @@ int32_t ApplicationStateObserverStub::HandleOnProcessDied(MessageParcel &data, M int32_t ApplicationStateObserverStub::HandleOnAppStateChanged(MessageParcel &data, MessageParcel &reply) { - std::unique_ptr processData(data.ReadParcelable()); + std::unique_ptr processData(data.ReadParcelable()); if (processData == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "ReadParcelable failed"); return -1; @@ -110,7 +110,7 @@ int32_t ApplicationStateObserverStub::HandleOnAppStateChanged(MessageParcel &dat int32_t ApplicationStateObserverStub::HandleOnAppStopped(MessageParcel &data, MessageParcel &reply) { - std::unique_ptr appStateData(data.ReadParcelable()); + std::unique_ptr appStateData(data.ReadParcelable()); if (appStateData == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "ReadParcelable failed"); return -1; @@ -122,7 +122,7 @@ int32_t ApplicationStateObserverStub::HandleOnAppStopped(MessageParcel &data, Me int32_t ApplicationStateObserverStub::HandleOnAppCacheStateChanged(MessageParcel &data, MessageParcel &reply) { - std::unique_ptr appStateData(data.ReadParcelable()); + std::unique_ptr appStateData(data.ReadParcelable()); if (appStateData == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "ReadParcelable failed"); return -1; diff --git a/services/privacymanager/BUILD.gn b/services/privacymanager/BUILD.gn index f26c76e5a..96bc6c531 100644 --- a/services/privacymanager/BUILD.gn +++ b/services/privacymanager/BUILD.gn @@ -107,6 +107,7 @@ if (is_standard_system && ability_base_enable == true) { ] external_deps = [ + "ability_runtime:app_state_data", "ability_base:want", "c_utils:utils", "hilog:libhilog", diff --git a/services/privacymanager/include/record/permission_record_manager.h b/services/privacymanager/include/record/permission_record_manager.h index 4f948de08..ca1876786 100644 --- a/services/privacymanager/include/record/permission_record_manager.h +++ b/services/privacymanager/include/record/permission_record_manager.h @@ -53,8 +53,8 @@ public: PrivacyAppStateObserver() = default; ~PrivacyAppStateObserver() = default; void OnProcessDied(const ProcessData &processData) override; - void OnAppStopped(const AppStateData &appStateData) override; - void OnAppStateChanged(const AppStateData &appStateData) override; + void OnAppStopped(const AppExecFwk::AppStateData &appStateData) override; + void OnAppStateChanged(const AppExecFwk::AppStateData &appStateData) override; DISALLOW_COPY_AND_MOVE(PrivacyAppStateObserver); }; diff --git a/services/privacymanager/src/record/permission_record_manager.cpp b/services/privacymanager/src/record/permission_record_manager.cpp index 0268ac750..4147647ac 100644 --- a/services/privacymanager/src/record/permission_record_manager.cpp +++ b/services/privacymanager/src/record/permission_record_manager.cpp @@ -108,26 +108,26 @@ PermissionRecordManager::~PermissionRecordManager() Unregister(); } -void PrivacyAppStateObserver::OnAppStateChanged(const AppStateData &appStateData) +void PrivacyAppStateObserver::OnAppStateChanged(const AppExecFwk::AppStateData &appStateData) { ACCESSTOKEN_LOG_DEBUG(LABEL, "OnChange(id=%{public}d, pid=%{public}d, state=%{public}d).", appStateData.accessTokenId, appStateData.pid, appStateData.state); ActiveChangeType status = PERM_INACTIVE; - if (appStateData.state == static_cast(ApplicationState::APP_STATE_FOREGROUND)) { + if (appStateData.state == static_cast(AppExecFwk::ApplicationFlag::APP_STATE_FOREGROUND)) { status = PERM_ACTIVE_IN_FOREGROUND; - } else if (appStateData.state == static_cast(ApplicationState::APP_STATE_BACKGROUND)) { + } else if (appStateData.state == static_cast(AppExecFwk::ApplicationFlag::APP_STATE_BACKGROUND)) { status = PERM_ACTIVE_IN_BACKGROUND; } PermissionRecordManager::GetInstance().NotifyAppStateChange(appStateData.accessTokenId, appStateData.pid, status); } -void PrivacyAppStateObserver::OnAppStopped(const AppStateData &appStateData) +void PrivacyAppStateObserver::OnAppStopped(const AppExecFwk::AppStateData &appStateData) { ACCESSTOKEN_LOG_INFO(LABEL, "OnChange(id=%{public}d, state=%{public}d).", appStateData.accessTokenId, appStateData.state); - if (appStateData.state == static_cast(ApplicationState::APP_STATE_TERMINATED)) { + if (appStateData.state == static_cast(AppExecFwk::ApplicationFlag::APP_STATE_TERMINATED)) { PermissionRecordManager::GetInstance().RemoveRecordFromStartListByToken(appStateData.accessTokenId); } } @@ -1497,7 +1497,7 @@ int32_t PermissionRecordManager::GetPermissionUsedTypeInfos(AccessTokenID tokenI int32_t PermissionRecordManager::GetAppStatus(AccessTokenID tokenId, int32_t pid) { int32_t status = PERM_ACTIVE_IN_BACKGROUND; - std::vector foreGroundAppList; + std::vector foreGroundAppList; AppManagerAccessClient::GetInstance().GetForegroundApplications(foreGroundAppList); if (std::any_of(foreGroundAppList.begin(), foreGroundAppList.end(), [=](const auto& foreGroundApp) { -- Gitee