From fecb1a325b650701c30254d416e3e045bf0eb3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 24 Feb 2022 06:44:13 +0000 Subject: [PATCH 1/3] Description:suitable for the daily record Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No #I4TYVU; Signed-off-by: wuluofeng --- .../src/gt_bundle_manager_service.cpp | 5 +- utils/bundle_lite/aafwk_event_error_code.h | 60 +++++++++++++++++++ utils/bundle_lite/aafwk_event_error_id.h | 41 +++++++++++++ utils/bundle_lite/adapter.h | 2 - 4 files changed, 105 insertions(+), 3 deletions(-) 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..fc35e02 100755 --- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp @@ -14,7 +14,8 @@ */ #include "gt_bundle_manager_service.h" - +#include "aafwk_event_error_id.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.h b/utils/bundle_lite/aafwk_event_error_code.h new file mode 100644 index 0000000..9a687bc --- /dev/null +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -0,0 +1,60 @@ +/* + * 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. + */ + +#ifndef UTILS_BUNDLE_LITE_AAFWK_EVENT_ERROR_CODE_H +#define UTILS_BUNDLE_LITE_AAFWK_EVENT_ERROR_CODE_H + +#include "memory_heap.h" +#include "product_adapter.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) + +class AafwkEventCodePrint final : public MemoryHeap { +public: + + AafwkEventCodePrint() = default; + + ~AafwkEventCodePrint() = default; + + static AafwkEventCodePrint *GetInstance() + { + static AafwkEventCodePrint printInstance; + return &printInstance; + } + + void AafwkEventPrint(uint8_t info2, uint8_t info3) + { + ProductAdapter::PrintEventTrace(0, info2, info3); + } + + void AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3) + { + ProductAdapter::PrintEventTrace(info1, info2, info3); + } + + void AafwkErrorPrint(uint8_t info1, uint16_t info2) + { + ProductAdapter::PrintErrCode(info1, info2); + } +}; +} +} +#endif \ No newline at end of file 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..6b5168a --- /dev/null +++ b/utils/bundle_lite/aafwk_event_error_id.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. + */ + +#ifndef UTILS_BUNDLE_LITE_AAFWK_EVENT_ERROR_ID_H +#define UTILS_BUNDLE_LITE_AAFWK_EVENT_ERROR_ID_H + +// event codes +#define MT_ACE_APP_START 0x00 +#define MT_ACE_APP_ACTIVE 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_TSAK_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_FALIED 0x1 +#define EXCE_ACE_APP_SCAN_PARSE_PROFILE_FALIED 0x2 + +#endif \ 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 9e989334787c38f055fbc18f7ce3a66a603cf868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 24 Feb 2022 07:13:45 +0000 Subject: [PATCH 2/3] 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 +- 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 9a687bc..79b78cb 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * 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 diff --git a/utils/bundle_lite/aafwk_event_error_id.h b/utils/bundle_lite/aafwk_event_error_id.h index 6b5168a..414f84a 100644 --- a/utils/bundle_lite/aafwk_event_error_id.h +++ b/utils/bundle_lite/aafwk_event_error_id.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Huawei Device Co., Ltd. + * 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 -- Gitee From 734c7a3ea50858896c4c7a85b699fa1f0a5379da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 24 Feb 2022 07:34:50 +0000 Subject: [PATCH 3/3] 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_id.h | 38 ++++++++++++++---------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/utils/bundle_lite/aafwk_event_error_id.h b/utils/bundle_lite/aafwk_event_error_id.h index 414f84a..dab7d30 100644 --- a/utils/bundle_lite/aafwk_event_error_id.h +++ b/utils/bundle_lite/aafwk_event_error_id.h @@ -17,25 +17,31 @@ #define UTILS_BUNDLE_LITE_AAFWK_EVENT_ERROR_ID_H // event codes -#define MT_ACE_APP_START 0x00 -#define MT_ACE_APP_ACTIVE 0x01 -#define MT_ACE_APP_BACKGROUND 0x02 -#define MT_ACE_APP_STOP 0x03 +enum { + MT_ACE_APP_START = 0x01, + MT_ACE_APP_ACTIVE, + MT_ACE_APP_BACKGROUND, + MT_ACE_APP_STOP +} AceAppType; -// error codes +// start 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_TSAK_FAILED 0x3 -#define EXCE_ACE_APP_START_LAUNCHER_EXIT_FAILED 0x4 +enum { +EXCE_ACE_APP_START_UNKNOWN_BUNDLE_INFO = 0x0, +EXCE_ACE_APP_START_CREATE_TSAK_FAILED = 0x3, +EXCE_ACE_APP_START_LAUNCHER_EXIT_FAILED +EXCE_ACE_APP_STOP_NO_ABILITY_RUNNING, +EXCE_ACE_APP_STOP_UNKNOWN_ABILITY_TOKEN +} AceAppStartError; -#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_FALIED 0x2 +// scan error codes +#define EXCE_ACE_APP_SCAN 0x07 +enum { +EXCE_ACE_APP_SCAN_INVALID_SYSTEM_APP = 0x0, +EXCE_ACE_APP_SCAN_PARSE_JSON_FALIED, +EXCE_ACE_APP_SCAN_PARSE_PROFILE_FALIED, +EXCE_ACE_APP_SCAN_UNKNOWN_BUNDLE_INFO +} AceAppScanError; #endif \ No newline at end of file -- Gitee