From c829f0a6f3988e664c58368f54a882c685a24b24 Mon Sep 17 00:00:00 2001 From: yangzk Date: Wed, 23 Oct 2024 09:56:25 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!10599?= =?UTF-8?q?=20:=20=E3=80=90=E6=8C=91=E5=8D=955.0.1release=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=84=8F=E5=9B=BE=E6=A1=86=E6=9E=B6stoull?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interfaces/inner_api/ability_manager/BUILD.gn | 6 ------ services/abilitymgr/src/insight_intent_execute_param.cpp | 9 +-------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index 6d9d592743..c9a3749a08 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -55,10 +55,6 @@ config("ability_manager_public_config") { } } -config("ability_manager_exception_config") { - cflags_cc = [ "-fexceptions" ] -} - ohos_shared_library("ability_manager") { branch_protector_ret = "pac_ret" @@ -113,8 +109,6 @@ ohos_shared_library("ability_manager") { ] } - configs = [ ":ability_manager_exception_config" ] - public_configs = [ ":ability_manager_public_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", diff --git a/services/abilitymgr/src/insight_intent_execute_param.cpp b/services/abilitymgr/src/insight_intent_execute_param.cpp index f325604381..bf96c64088 100644 --- a/services/abilitymgr/src/insight_intent_execute_param.cpp +++ b/services/abilitymgr/src/insight_intent_execute_param.cpp @@ -82,20 +82,13 @@ bool InsightIntentExecuteParam::GenerateFromWant(const AAFwk::Want &want, TAG_LOGE(AAFwkTag::INTENT, "empty want"); return false; } - uint64_t insightIntentId = 0; - try { - insightIntentId = std::stoull(wantParams.GetStringParam(INSIGHT_INTENT_EXECUTE_PARAM_ID)); - } catch (...) { - TAG_LOGE(AAFwkTag::ABILITY, "invalid insight intent ID"); - return false; - } AppExecFwk::ElementName elementName = want.GetElement(); executeParam.bundleName_ = elementName.GetBundleName(); executeParam.moduleName_ = elementName.GetModuleName(); executeParam.abilityName_ = elementName.GetAbilityName(); executeParam.insightIntentName_ = wantParams.GetStringParam(INSIGHT_INTENT_EXECUTE_PARAM_NAME); - executeParam.insightIntentId_ = insightIntentId; + executeParam.insightIntentId_ = std::stoull(wantParams.GetStringParam(INSIGHT_INTENT_EXECUTE_PARAM_ID)); executeParam.executeMode_ = wantParams.GetIntParam(INSIGHT_INTENT_EXECUTE_PARAM_MODE, 0); auto insightIntentParam = wantParams.GetWantParams(INSIGHT_INTENT_EXECUTE_PARAM_PARAM);