From 4eeed53c5548ce8b9a55879dd468bf3780d4f6ac Mon Sep 17 00:00:00 2001
From: njupthan <hanhaibin@huawei.com>
Date: Sat, 5 Mar 2022 12:12:35 +0000
Subject: [PATCH] fix merge error

Signed-off-by: njupthan <hanhaibin@huawei.com>
---
 interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp | 4 ++--
 services/appmgr/src/app_mgr_service.cpp                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp b/interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp
index 37514372260..22a1a163059 100644
--- a/interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp
+++ b/interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp
@@ -260,10 +260,10 @@ int32_t AppMgrProxy::GetProcessRunningInfosByUserId(std::vector<RunningProcessIn
     MessageParcel reply;
     MessageOption option(MessageOption::TF_SYNC);
 
-    data.WriteInt32(userId);
     if (!WriteInterfaceToken(data)) {
         return ERR_FLATTEN_OBJECT;
     }
+    data.WriteInt32(userId);
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         APP_LOGE("Remote() is NULL");
@@ -570,10 +570,10 @@ int AppMgrProxy::GetAbilityRecordsByProcessID(const int pid, std::vector<sptr<IR
     MessageParcel reply;
     MessageOption option(MessageOption::TF_SYNC);
 
-    data.WriteInt32(pid);
     if (!WriteInterfaceToken(data)) {
         return ERR_FLATTEN_OBJECT;
     }
+    data.WriteInt32(pid);
     if (!SendTransactCmd(IAppMgr::Message::APP_GET_ABILITY_RECORDS_BY_PROCESS_ID, data, reply)) {
         return ERR_NULL_OBJECT;
     }
diff --git a/services/appmgr/src/app_mgr_service.cpp b/services/appmgr/src/app_mgr_service.cpp
index 24f851d2f52..05cd47dc156 100755
--- a/services/appmgr/src/app_mgr_service.cpp
+++ b/services/appmgr/src/app_mgr_service.cpp
@@ -36,7 +36,7 @@ namespace OHOS {
 namespace AppExecFwk {
 namespace {
 static const int EXPERIENCE_MEM_THRESHOLD = 20;
-static const int APP_MS_TimeOut = 60;
+static const int APP_MS_TIMEOUT = 60;
 static const float PERCENTAGE = 100.0;
 const std::string TASK_ATTACH_APPLICATION = "AttachApplicationTask";
 const std::string TASK_APPLICATION_FOREGROUNDED = "ApplicationForegroundedTask";
@@ -150,7 +150,7 @@ ErrCode AppMgrService::Init()
         APP_LOGE("init failed without ams scheduler");
         return ERR_INVALID_OPERATION;
     }
-    if (HiviewDFX::Watchdog::GetInstance().AddThread("APPMSWatchdog", handler_, APP_MS_TimeOut) != 0) {
+    if (HiviewDFX::Watchdog::GetInstance().AddThread("APPMSWatchdog", handler_, APP_MS_TIMEOUT) != 0) {
         APP_LOGE("HiviewDFX::Watchdog::GetInstance AddThread Fail");
     }
     APP_LOGI("init success");
-- 
Gitee