diff --git a/hisysevent.yaml b/hisysevent.yaml index 0b7e8511b8..529fc282a4 100644 --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -50,6 +50,10 @@ THREAD_BLOCK_6S: START_ABILITY_ERROR: __BASE: {type: FAULT, level: MINOR, tag: ability, desc: start ability error} + USER_ID: {type: INT32, desc: userId} + ERROR_CODE: {type: INT32, desc: error code} + BUNDLE_NAME: {type: STRING, desc: bundle name} + MODULE_NAME: {type: STRING, desc: module name} ABILITY_NAME: {type: STRING, desc: ability name} TERMINATE_ABILITY_ERROR: @@ -147,40 +151,40 @@ DISCONNECT_SERVICE: APP_ATTACH: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: attach app} - BUNDLE_NAME: {type: STRING, desc: bundle name} - VERSION_NAME: {type: STRING, desc: version name} - VERSION_CODE: {type: INT32, desc: version code} PID: {type: INT32, desc: pid} - TIME_STAMP: {type: INT32, desc: time stamp} + VERSION_CODE: {type: INT32, desc: version code} + VERSION_NAME: {type: STRING, desc: version name} + PROCESS_NAME: {type: STRING, desc: process name} + BUNDLE_NAME: {type: STRING, desc: bundle name} APP_LAUNCH: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: launch app} - BUNDLE_NAME: {type: STRING, desc: bundle name} - VERSION_NAME: {type: STRING, desc: version name} - VERSION_CODE: {type: INT32, desc: version code} PID: {type: INT32, desc: pid} - TIME_STAMP: {type: INT32, desc: time stamp} + VERSION_CODE: {type: INT32, desc: version code} + VERSION_NAME: {type: STRING, desc: version name} + PROCESS_NAME: {type: STRING, desc: process name} + BUNDLE_NAME: {type: STRING, desc: bundle name} APP_FOREGROUND: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: foreground app} - BUNDLE_NAME: {type: STRING, desc: bundle name} - VERSION_NAME: {type: STRING, desc: version name} - VERSION_CODE: {type: INT32, desc: version code} PID: {type: INT32, desc: pid} - TIME_STAMP: {type: INT32, desc: time stamp} + VERSION_CODE: {type: INT32, desc: version code} + VERSION_NAME: {type: STRING, desc: version name} + PROCESS_NAME: {type: STRING, desc: process name} + BUNDLE_NAME: {type: STRING, desc: bundle name} APP_BACKGROUND: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: background app} - BUNDLE_NAME: {type: STRING, desc: bundle name} - VERSION_NAME: {type: STRING, desc: version name} - VERSION_CODE: {type: INT32, desc: version code} PID: {type: INT32, desc: pid} - TIME_STAMP: {type: INT32, desc: time stamp} + VERSION_CODE: {type: INT32, desc: version code} + VERSION_NAME: {type: STRING, desc: version name} + PROCESS_NAME: {type: STRING, desc: process name} + BUNDLE_NAME: {type: STRING, desc: bundle name} APP_TERMINATE: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: terminate app} - BUNDLE_NAME: {type: STRING, desc: bundle name} - VERSION_NAME: {type: STRING, desc: version name} - VERSION_CODE: {type: INT32, desc: version code} PID: {type: INT32, desc: pid} - TIME_STAMP: {type: INT32, desc: time stamp} \ No newline at end of file + VERSION_CODE: {type: INT32, desc: version code} + VERSION_NAME: {type: STRING, desc: version name} + PROCESS_NAME: {type: STRING, desc: process name} + BUNDLE_NAME: {type: STRING, desc: bundle name} \ No newline at end of file diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 39113ac091..e9b301efcd 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -838,7 +838,7 @@ int AbilityManagerService::StopExtensionAbility(const Want &want, const sptrStopServiceAbility(abilityRequest); - AAFWK::EventReport::SendExtensionEvent(AAFWK::STOP_EXTENSION_ERROR, - HiSysEventType::FAULT, - eventInfo); + if (eventInfo.errCode != ERR_OK) { + AAFWK::EventReport::SendExtensionEvent(AAFWK::STOP_EXTENSION_ERROR, + HiSysEventType::FAULT, + eventInfo); + } return eventInfo.errCode; }