diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index 99b37175899cf4e7474c53b28537099b25767873..fc35e022b40da646c8c984329930c6dec82817b9 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 0000000000000000000000000000000000000000..79b78cb38fa5e6dabd534986a4c04dd4d5dae760 --- /dev/null +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -0,0 +1,60 @@ +/* + * 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 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 0000000000000000000000000000000000000000..dab7d30cba1e8d0810d957ca3bdc0a92d7544a47 --- /dev/null +++ b/utils/bundle_lite/aafwk_event_error_id.h @@ -0,0 +1,47 @@ +/* + * 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 UTILS_BUNDLE_LITE_AAFWK_EVENT_ERROR_ID_H +#define UTILS_BUNDLE_LITE_AAFWK_EVENT_ERROR_ID_H + +// event codes +enum { + MT_ACE_APP_START = 0x01, + MT_ACE_APP_ACTIVE, + MT_ACE_APP_BACKGROUND, + MT_ACE_APP_STOP +} AceAppType; + +// start error codes +#define EXCE_ACE_APP_START 0x01 + +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; + +// 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 diff --git a/utils/bundle_lite/adapter.h b/utils/bundle_lite/adapter.h index 7cdc82b8583fd9f9c5a3acbacdf7a7dd71a28599..2039c89301474c3001c57adbd7114eec8fb9fea4 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)