From 28ad5f3f44df5a97501acc444732d9f0b54e3a62 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 02:02:01 +0000 Subject: [PATCH 1/3] =?UTF-8?q?Description:suitable=20for=20the=20daily=20?= =?UTF-8?q?record=20Sig:aafwk=20Feature=20or=20Bugfix:Bugfix=20Binary=20So?= =?UTF-8?q?urce:No=20#I4TYVU;=20Signed-off-by:=20=E5=90=B4=E7=8F=9E?= =?UTF-8?q?=E9=A3=8E=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuluofeng --- services/bundlemgr_lite/src/gt_bundle_manager_service.cpp | 5 ++++- utils/bundle_lite/adapter.h | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index 99b3717..74d7b52 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/adapter.h b/utils/bundle_lite/adapter.h index 7cdc82b..ee08967 100755 --- a/utils/bundle_lite/adapter.h +++ b/utils/bundle_lite/adapter.h @@ -76,8 +76,7 @@ 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 fdbd7d62ba44dcc4b98a8fa4d8806cb7821e3035 Mon Sep 17 00:00:00 2001 From: wuluofeng Date: Tue, 22 Feb 2022 10:14:16 +0800 Subject: [PATCH 2/3] 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 | 41 ++++++++++++++++++++ utils/bundle_lite/aafwk_event_error_code.h | 41 ++++++++++++++++++++ utils/bundle_lite/aafwk_event_error_id.h | 35 +++++++++++++++++ 3 files changed, 117 insertions(+) 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/utils/bundle_lite/aafwk_event_error_code.cpp b/utils/bundle_lite/aafwk_event_error_code.cpp new file mode 100644 index 0000000..10dff7e --- /dev/null +++ b/utils/bundle_lite/aafwk_event_error_code.cpp @@ -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 "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..0fc6694 --- /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 -- Gitee From 5f91d2cc706620c2c1393ad0a1f45b275a036b0d 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 02:35:45 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20util?= =?UTF-8?q?s/bundle=5Flite/aafwk=5Fevent=5Ferror=5Fid.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/bundle_lite/aafwk_event_error_id.h | 35 ------------------------ 1 file changed, 35 deletions(-) delete mode 100644 utils/bundle_lite/aafwk_event_error_id.h diff --git a/utils/bundle_lite/aafwk_event_error_id.h b/utils/bundle_lite/aafwk_event_error_id.h deleted file mode 100644 index 7c71e09..0000000 --- a/utils/bundle_lite/aafwk_event_error_id.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 -- Gitee