From 8f3d44eb8064bbe5ba5b1aca61306341aac3f95f Mon Sep 17 00:00:00 2001 From: wuluofeng Date: Tue, 22 Feb 2022 10:49:29 +0800 Subject: [PATCH 01/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- .../src/gt_bundle_manager_service.cpp | 3 ++ utils/bundle_lite/aafwk_event_error_code.cpp | 40 ++++++++++++++++++ utils/bundle_lite/aafwk_event_error_code.h | 41 +++++++++++++++++++ utils/bundle_lite/aafwk_event_error_id.h | 35 ++++++++++++++++ utils/bundle_lite/adapter.h | 2 - 5 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 utils/bundle_lite/aafwk_event_error_code.cpp create mode 100644 utils/bundle_lite/aafwk_event_error_code.h create mode 100644 utils/bundle_lite/aafwk_event_error_id.h diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index 99b3717..7bf3137 100755 --- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp @@ -15,6 +15,7 @@ #include "gt_bundle_manager_service.h" +#include "aafwk_event_error_code.h" #include "ability_info_utils.h" #include "ability_message_id.h" #include "appexecfwk_errors.h" @@ -36,6 +37,8 @@ #include "utils.h" #include "want.h" +using namespace OHOS::ACELite; + namespace OHOS { const uint8_t OPERATION_DOING = 200; const uint8_t BMS_INSTALLATION_START = 101; diff --git a/utils/bundle_lite/aafwk_event_error_code.cpp b/utils/bundle_lite/aafwk_event_error_code.cpp new file mode 100644 index 0000000..cd1ffbf --- /dev/null +++ b/utils/bundle_lite/aafwk_event_error_code.cpp @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2020 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 "aafwk_event_error_code.h" +#include "product_adapter.h" + +namespace OHOS { +AafwkEventCodePrint *AafwkEventCodePrint::GetInstance() +{ + static AafwkEventCodePrint printInstance; + return &printInstance; +} + +void AafwkEventCodePrint::AafwkEventPrint(uint8_t info2, uint8_t info3) +{ + ProductAdapter::PrintEventTrace(0, info2, info3); +} + +void AafwkEventCodePrint::AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3) +{ + ProductAdapter::PrintEventTrace(info1, info2, info3); +} + +void AafwkEventCodePrint::AafwkErrorPrint(uint8_t info1, uint16_t info2) +{ + ProductAdapter::PrintErrCode(info1, info2); +} +} // namespace OHOS \ No newline at end of file diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h new file mode 100644 index 0000000..8567730 --- /dev/null +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2020 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 "memory_heap.h" + +#include "aafwk_event_error_id.h" + +#define APP_EVENT(code1) \ + AafwkEventCodePrint::GetInstance()->AafwkEventPrint(code1, 0) +#define APP_ERRORCODE_EXTRA(code1, code2) \ + AafwkEventCodePrint::GetInstance()->AafwkErrorPrint(code1, code2) + +namespace OHOS { +class AafwkEventCodePrint final : public MemoryHeap { +public: + + AafwkEventCodePrint() = default; + + ~AafwkEventCodePrint() = default; + + static AafwkEventCodePrint *GetInstance(); + + void AafwkEventPrint(uint8_t info2, uint8_t info3); + + void AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3); + + void AafwkErrorPrint(uint8_t info2, uint16_t info3); +}; +} diff --git a/utils/bundle_lite/aafwk_event_error_id.h b/utils/bundle_lite/aafwk_event_error_id.h new file mode 100644 index 0000000..7c71e09 --- /dev/null +++ b/utils/bundle_lite/aafwk_event_error_id.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2020 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. + */ + +// event codes +#define MT_ACE_APP_START 0x00 +#define MT_ACE_APP_ACTIVITY 0x01 +#define MT_ACE_APP_BACKGROUND 0x02 +#define MT_ACE_APP_STOP 0x03 + +// error codes +#define EXCE_ACE_APP_START 0x01 +#define EXCE_ACE_APP_SCAN 0x07 + +#define EXCE_ACE_APP_START_UNKNOWN_BUNDLE_INFO 0x0 +#define EXCE_ACE_APP_STOP_NO_ABILITY_RUNNING 0x5 +#define EXCE_ACE_APP_STOP_UNKNOWN_ABILITY_TOKEN 0x6 +#define EXCE_ACE_APP_START_CREATE_TASK_FAILED 0x3 +#define EXCE_ACE_APP_START_LAUNCHER_EXIT_FAILED 0x4 + +#define EXCE_ACE_APP_SCAN_INVALID_SYSTEM_APP 0x0 +#define EXCE_ACE_APP_SCAN_UNKNOWN_BUNDLE_INFO 0x3 +#define EXCE_ACE_APP_SCAN_PARSE_JSON_FAILED 0x1 +#define EXCE_ACE_APP_SCAN_PARSE_PROFILE_FAILEd 0x2 \ No newline at end of file diff --git a/utils/bundle_lite/adapter.h b/utils/bundle_lite/adapter.h index 7cdc82b..2039c89 100755 --- a/utils/bundle_lite/adapter.h +++ b/utils/bundle_lite/adapter.h @@ -76,8 +76,6 @@ const unsigned int RETRY_TIMES = 10; } \ } while (0) -#define APP_ERRCODE_EXTRA(code1, code2) -#define APP_EVENT(code1) #define RecordAbiityInfoEvt(code1) #define MutexDelete(a) osMutexDelete(a) #define MutexAcquire(a, b) osMutexAcquire(a, b) -- Gitee From 8b24d90b852404886e90fd59e46bf11c48d3edfd Mon Sep 17 00:00:00 2001 From: wuluofeng Date: Tue, 22 Feb 2022 12:11:57 +0800 Subject: [PATCH 02/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- services/bundlemgr_lite/src/gt_bundle_manager_service.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index 7bf3137..ae3eb57 100755 --- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "gt_bundle_manager_service.h" - +#include "aafwk_event_error__id.h" #include "aafwk_event_error_code.h" +#include "gt_bundle_manager_service.h" #include "ability_info_utils.h" #include "ability_message_id.h" #include "appexecfwk_errors.h" -- Gitee From df1d437defd348f63bb96df3bf7947a7509bd282 Mon Sep 17 00:00:00 2001 From: wuluofeng Date: Tue, 22 Feb 2022 12:32:24 +0800 Subject: [PATCH 03/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.h | 2 +- utils/bundle_lite/aafwk_event_error_id.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index 8567730..61204d9 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -19,7 +19,7 @@ #define APP_EVENT(code1) \ AafwkEventCodePrint::GetInstance()->AafwkEventPrint(code1, 0) -#define APP_ERRORCODE_EXTRA(code1, code2) \ +#define APP_ERRCODE_EXTRA(code1, code2) \ AafwkEventCodePrint::GetInstance()->AafwkErrorPrint(code1, code2) namespace OHOS { diff --git a/utils/bundle_lite/aafwk_event_error_id.h b/utils/bundle_lite/aafwk_event_error_id.h index 7c71e09..147bfe6 100644 --- a/utils/bundle_lite/aafwk_event_error_id.h +++ b/utils/bundle_lite/aafwk_event_error_id.h @@ -15,7 +15,7 @@ // event codes #define MT_ACE_APP_START 0x00 -#define MT_ACE_APP_ACTIVITY 0x01 +#define MT_ACE_APP_ACTIVE 0x01 #define MT_ACE_APP_BACKGROUND 0x02 #define MT_ACE_APP_STOP 0x03 @@ -26,7 +26,7 @@ #define EXCE_ACE_APP_START_UNKNOWN_BUNDLE_INFO 0x0 #define EXCE_ACE_APP_STOP_NO_ABILITY_RUNNING 0x5 #define EXCE_ACE_APP_STOP_UNKNOWN_ABILITY_TOKEN 0x6 -#define EXCE_ACE_APP_START_CREATE_TASK_FAILED 0x3 +#define EXCE_ACE_APP_START_CREATE_TSAK_FAILED 0x3 #define EXCE_ACE_APP_START_LAUNCHER_EXIT_FAILED 0x4 #define EXCE_ACE_APP_SCAN_INVALID_SYSTEM_APP 0x0 -- Gitee From ab3e2f02de3820d06d5c517f2c5bac84dea51a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 05:30:03 +0000 Subject: [PATCH 04/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index 61204d9..cb6da31 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -23,6 +23,7 @@ AafwkEventCodePrint::GetInstance()->AafwkErrorPrint(code1, code2) namespace OHOS { +namespace ACELite { class AafwkEventCodePrint final : public MemoryHeap { public: @@ -39,3 +40,4 @@ public: void AafwkErrorPrint(uint8_t info2, uint16_t info3); }; } +} -- Gitee From 9fc8eea26a8aa19b7790b60378d55058828cb196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 05:42:13 +0000 Subject: [PATCH 05/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- services/bundlemgr_lite/src/gt_bundle_manager_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index ae3eb57..3c92a40 100755 --- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "aafwk_event_error__id.h" +#include "aafwk_event_error_id.h" #include "aafwk_event_error_code.h" #include "gt_bundle_manager_service.h" #include "ability_info_utils.h" -- Gitee From b4a08cce12cce68745e4c632137304b29e4eb897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 06:32:01 +0000 Subject: [PATCH 06/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.h | 2 +- utils/bundle_lite/aafwk_event_error_id.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index cb6da31..c27b2ee 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -20,7 +20,7 @@ #define APP_EVENT(code1) \ AafwkEventCodePrint::GetInstance()->AafwkEventPrint(code1, 0) #define APP_ERRCODE_EXTRA(code1, code2) \ - AafwkEventCodePrint::GetInstance()->AafwkErrorPrint(code1, code2) + AafwkEventCodePrint::GetInstance()->AafwkErrorPrint(code1, code2, 0) namespace OHOS { namespace ACELite { diff --git a/utils/bundle_lite/aafwk_event_error_id.h b/utils/bundle_lite/aafwk_event_error_id.h index 147bfe6..f492214 100644 --- a/utils/bundle_lite/aafwk_event_error_id.h +++ b/utils/bundle_lite/aafwk_event_error_id.h @@ -31,5 +31,5 @@ #define EXCE_ACE_APP_SCAN_INVALID_SYSTEM_APP 0x0 #define EXCE_ACE_APP_SCAN_UNKNOWN_BUNDLE_INFO 0x3 -#define EXCE_ACE_APP_SCAN_PARSE_JSON_FAILED 0x1 +#define EXCE_ACE_APP_SCAN_PARSE_JSON_FALIED 0x1 #define EXCE_ACE_APP_SCAN_PARSE_PROFILE_FAILEd 0x2 \ No newline at end of file -- Gitee From cf54cf5b2bd2bc4195edbb204c94db1c7e65eac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 07:14:30 +0000 Subject: [PATCH 07/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index c27b2ee..cb6da31 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -20,7 +20,7 @@ #define APP_EVENT(code1) \ AafwkEventCodePrint::GetInstance()->AafwkEventPrint(code1, 0) #define APP_ERRCODE_EXTRA(code1, code2) \ - AafwkEventCodePrint::GetInstance()->AafwkErrorPrint(code1, code2, 0) + AafwkEventCodePrint::GetInstance()->AafwkErrorPrint(code1, code2) namespace OHOS { namespace ACELite { -- Gitee From 82905c099fe23e00aa2a8fea20359c15b9eff9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 07:24:50 +0000 Subject: [PATCH 08/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_id.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/bundle_lite/aafwk_event_error_id.h b/utils/bundle_lite/aafwk_event_error_id.h index f492214..8e0d273 100644 --- a/utils/bundle_lite/aafwk_event_error_id.h +++ b/utils/bundle_lite/aafwk_event_error_id.h @@ -32,4 +32,4 @@ #define EXCE_ACE_APP_SCAN_INVALID_SYSTEM_APP 0x0 #define EXCE_ACE_APP_SCAN_UNKNOWN_BUNDLE_INFO 0x3 #define EXCE_ACE_APP_SCAN_PARSE_JSON_FALIED 0x1 -#define EXCE_ACE_APP_SCAN_PARSE_PROFILE_FAILEd 0x2 \ No newline at end of file +#define EXCE_ACE_APP_SCAN_PARSE_PROFILE_FALIED 0x2 \ No newline at end of file -- Gitee From e7f9f22e9e49b0b3d45337f7098ee2f12e7d3477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 07:45:32 +0000 Subject: [PATCH 09/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.cpp | 2 ++ utils/bundle_lite/aafwk_event_error_code.h | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/bundle_lite/aafwk_event_error_code.cpp b/utils/bundle_lite/aafwk_event_error_code.cpp index cd1ffbf..22c0211 100644 --- a/utils/bundle_lite/aafwk_event_error_code.cpp +++ b/utils/bundle_lite/aafwk_event_error_code.cpp @@ -17,6 +17,7 @@ #include "product_adapter.h" namespace OHOS { +namespace ACELite { AafwkEventCodePrint *AafwkEventCodePrint::GetInstance() { static AafwkEventCodePrint printInstance; @@ -37,4 +38,5 @@ void AafwkEventCodePrint::AafwkErrorPrint(uint8_t info1, uint16_t info2) { ProductAdapter::PrintErrCode(info1, info2); } +} } // namespace OHOS \ No newline at end of file diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index cb6da31..8f27e8a 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -14,16 +14,15 @@ */ #include "memory_heap.h" - #include "aafwk_event_error_id.h" +namespace OHOS { +namespace ACELite { #define APP_EVENT(code1) \ AafwkEventCodePrint::GetInstance()->AafwkEventPrint(code1, 0) #define APP_ERRCODE_EXTRA(code1, code2) \ AafwkEventCodePrint::GetInstance()->AafwkErrorPrint(code1, code2) - -namespace OHOS { -namespace ACELite { + class AafwkEventCodePrint final : public MemoryHeap { public: -- Gitee From 5981165f20c4cf8e24843d7141f0a5806bfcd9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 08:02:56 +0000 Subject: [PATCH 10/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.cpp | 2 +- utils/bundle_lite/aafwk_event_error_code.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/bundle_lite/aafwk_event_error_code.cpp b/utils/bundle_lite/aafwk_event_error_code.cpp index 22c0211..c83879c 100644 --- a/utils/bundle_lite/aafwk_event_error_code.cpp +++ b/utils/bundle_lite/aafwk_event_error_code.cpp @@ -34,7 +34,7 @@ void AafwkEventCodePrint::AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t ProductAdapter::PrintEventTrace(info1, info2, info3); } -void AafwkEventCodePrint::AafwkErrorPrint(uint8_t info1, uint16_t info2) +void AafwkEventCodePrint::AafwkErrorPrint(uint16_t info1, uint16_t info2) { ProductAdapter::PrintErrCode(info1, info2); } diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index 8f27e8a..152276f 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -36,7 +36,7 @@ public: void AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3); - void AafwkErrorPrint(uint8_t info2, uint16_t info3); + void AafwkErrorPrint(uint16_t info2, uint16_t info3); }; } } -- Gitee From c41fd4d62c1cfacc95554b657855b1d9b84800e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 08:20:07 +0000 Subject: [PATCH 11/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng --- services/bundlemgr_lite/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index 60bbb54..c83d096 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -29,6 +29,7 @@ if (ohos_kernel_type == "liteos_m") { "src/gt_bundle_manager_service.cpp", "src/gt_bundle_parser.cpp", "src/gt_extractor_util.cpp", + "../../util/bundle_lite/aafwk_event_error_code.cpp", ] deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", -- Gitee From 08d9b9168034540dbc61ddb24ff95f4d554ddfeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 08:21:02 +0000 Subject: [PATCH 12/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index 152276f..8f27e8a 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -36,7 +36,7 @@ public: void AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3); - void AafwkErrorPrint(uint16_t info2, uint16_t info3); + void AafwkErrorPrint(uint8_t info2, uint16_t info3); }; } } -- Gitee From 0ffbfdfb8914ff549a6daed548621d908d45cc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 08:21:22 +0000 Subject: [PATCH 13/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng --- utils/bundle_lite/aafwk_event_error_code.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/bundle_lite/aafwk_event_error_code.cpp b/utils/bundle_lite/aafwk_event_error_code.cpp index c83879c..22c0211 100644 --- a/utils/bundle_lite/aafwk_event_error_code.cpp +++ b/utils/bundle_lite/aafwk_event_error_code.cpp @@ -34,7 +34,7 @@ void AafwkEventCodePrint::AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t ProductAdapter::PrintEventTrace(info1, info2, info3); } -void AafwkEventCodePrint::AafwkErrorPrint(uint16_t info1, uint16_t info2) +void AafwkEventCodePrint::AafwkErrorPrint(uint8_t info1, uint16_t info2) { ProductAdapter::PrintErrCode(info1, info2); } -- Gitee From 27eaa99601c7cbd7159d38773f74e7d86935cd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 08:40:48 +0000 Subject: [PATCH 14/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng --- services/bundlemgr_lite/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index c83d096..61c3211 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -29,7 +29,7 @@ if (ohos_kernel_type == "liteos_m") { "src/gt_bundle_manager_service.cpp", "src/gt_bundle_parser.cpp", "src/gt_extractor_util.cpp", - "../../util/bundle_lite/aafwk_event_error_code.cpp", + "../util/bundle_lite/aafwk_event_error_code.cpp", ] deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", -- Gitee From 72dd7642bc4d1de33fbb112cfe7597757d959213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 09:13:22 +0000 Subject: [PATCH 15/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng --- services/bundlemgr_lite/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index 61c3211..ff3c86f 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -29,7 +29,7 @@ if (ohos_kernel_type == "liteos_m") { "src/gt_bundle_manager_service.cpp", "src/gt_bundle_parser.cpp", "src/gt_extractor_util.cpp", - "../util/bundle_lite/aafwk_event_error_code.cpp", + "${aafwk_lite_path}/utils/bundle_lite/aafwk_event_error_code.cpp", ] deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", -- Gitee From 244bdad5e28511c5c13c07819f2872871428b18b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 22 Feb 2022 09:31:38 +0000 Subject: [PATCH 16/16] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng --- services/bundlemgr_lite/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index ff3c86f..3287667 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -29,7 +29,7 @@ if (ohos_kernel_type == "liteos_m") { "src/gt_bundle_manager_service.cpp", "src/gt_bundle_parser.cpp", "src/gt_extractor_util.cpp", - "${aafwk_lite_path}/utils/bundle_lite/aafwk_event_error_code.cpp", + "${appexecfwk_lite_path}/utils/bundle_lite/aafwk_event_error_code.cpp", ] deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", -- Gitee