diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index be54e8252c0ba21c8e8ebf78867b89f41c99b376..5326479e7df24bd38ab90bab77eff0d730c27be2 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -86,7 +86,7 @@ typedef enum SystemCapabilityNum { GRAPHIC_WMS, HIVIEWDFX_HIAPPEVENT, HIVIEWDFX_HICHECKER, - HIVIEWDFX_HIDUMPER, + HIVIEWDFX_HIDUMPER, // abandoned HIEVENTKLITE, HIVIEWDFX_HILOG, HIVIEWDFX_HILOGLITE, @@ -160,7 +160,7 @@ typedef enum SystemCapabilityNum { SENSORS_MISCDEVICE, SENSORS_SENSOR, SENSORS_SENSOR_LITE, - TELEPHONY_CALLMANAGER, + TELEPHONY_CALLMANAGER, // abandoned TELEPHONY_CELLULARCALL, TELEPHONY_CELLULARDATA, TELEPHONY_CORESERVICE, @@ -379,6 +379,10 @@ typedef enum SystemCapabilityNum { DISTRIBUTEDSCHED_APPCOLLABORATION, MULTIMEDIA_AVSESSION_AVINPUTCAST, GAME_GAMECONTROLLER, + DISTRIBUTEDDATAMANAGER_DATAINTELLIGENCE_CORE, + MULTIMODALAWARENESS_DEVICESTATUS, + USB_USBMANAGER_SERIAL, + GRAPHIC_GRAPHIC2D_GL4, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; @@ -435,6 +439,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Graphic.Graphic2D.EGL", GRAPHIC_GRAPHIC2D_EGL}, {"SystemCapability.Graphic.Graphic2D.GLES2", GRAPHIC_GRAPHIC2D_GLES2}, {"SystemCapability.Graphic.Graphic2D.GLES3", GRAPHIC_GRAPHIC2D_GLES3}, + {"SystemCapability.Graphic.Graphic2D.GL4", GRAPHIC_GRAPHIC2D_GL4}, {"SystemCapability.Graphic.Graphic2D.HyperGraphicManager", GRAPHIC_GRAPHIC2D_HYPERGRAPHICMANAGER}, {"SystemCapability.Graphic.Graphic2D.NativeBuffer", GRAPHIC_GRAPHIC2D_NATIVEBUFFER}, {"SystemCapability.Graphic.Graphic2D.NativeImage", GRAPHIC_GRAPHIC2D_NATIVEIMAGE}, @@ -449,7 +454,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Graphic.Wms", GRAPHIC_WMS}, {"SystemCapability.HiviewDFX.HiAppEvent", HIVIEWDFX_HIAPPEVENT}, {"SystemCapability.HiviewDFX.HiChecker", HIVIEWDFX_HICHECKER}, - {"SystemCapability.HiviewDFX.HiDumper", HIVIEWDFX_HIDUMPER}, + {"SystemCapability.HiviewDFX.HiDumper", HIVIEWDFX_HIDUMPER}, // abandoned {"SystemCapability.HiviewDFX.HiEventLite", HIEVENTKLITE}, {"SystemCapability.HiviewDFX.HiLog", HIVIEWDFX_HILOG}, {"SystemCapability.HiviewDFX.HiLogLite", HIVIEWDFX_HILOGLITE}, @@ -546,6 +551,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Updater.Raw", UPDATER_RAW}, {"SystemCapability.Update.UpdateService", UPDATE_UPDATESERVICE}, {"SystemCapability.USB.USBManager", USB_USBMANAGER}, + {"SystemCapability.USB.USBManager.Serial", USB_USBMANAGER_SERIAL}, {"SystemCapability.UserIAM.UserAuth.Core", USERIAM_USERAUTH_CORE}, {"SystemCapability.UserIAM.UserAuth.FaceAuth", USERIAM_USERAUTH_FACEAUTH}, {"SystemCapability.UserIAM.UserAuth.FingerprintAuth", USERIAM_USERAUTH_FINGERPRINTAUTH}, @@ -742,6 +748,8 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.MultimodalAwarness.Motion", MULTIMODALAWARENESS_MOTION}, {"SystemCapability.DistributedSched.AppCollaboration", DISTRIBUTEDSCHED_APPCOLLABORATION}, {"SystemCapability.Game.GameController", GAME_GAMECONTROLLER}, + {"SystemCapability.DistributedDataManager.DataIntelligence.Core", DISTRIBUTEDDATAMANAGER_DATAINTELLIGENCE_CORE}, + {"SystemCapability.MultimodalAwareness.DeviceStatus", MULTIMODALAWARENESS_DEVICESTATUS}, }; #ifdef __cplusplus diff --git a/src/create_pcid.c b/src/create_pcid.c index da299fe77dc9004582e5ae4320bc7a3338b4f379..1b08215bc22b6d05260ac2ba526223c29de62bab 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -379,6 +379,11 @@ static int32_t GetPriSyscap(PCIDMain *pcidMain, cJSON *sysCapObject, int32_t con char *tempPriSyscapStr = priSyscapStr; char *ptrPrivateSyscap = (char *)(pcidMain + 1); while (*ptrPrivateSyscap != '\0') { + size_t currentLen = tempPriSyscapStr - priSyscapStr; + if (currentLen >= SINGLE_SYSCAP_LEN - 1) { + printf("Syscap name exceeds maximum length\n"); + return GetPriSyscapResult(capVectorPtr, -1); + } if (*ptrPrivateSyscap == ',') { *tempPriSyscapStr = '\0'; int32_t ret = sprintf_s(fullCapStr, SINGLE_SYSCAP_LEN, "SystemCapability.%s", priSyscapStr); diff --git a/test/unittest/common/BUILD.gn b/test/unittest/common/BUILD.gn index 262134296f2008458458a825b58e9adc52aff787..ea89fb0eb6664850a6b0f5d0178e02713de1dcaf 100644 --- a/test/unittest/common/BUILD.gn +++ b/test/unittest/common/BUILD.gn @@ -64,7 +64,7 @@ if (defined(ohos_lite)) { import("//build/ohos.gni") import("//build/test.gni") - module_output_path = "developtools/syscap_codec" + module_output_path = "syscap_codec/syscap_codec" ohos_unittest("syscap_codec_test") { module_out_path = module_output_path diff --git a/tools/syscap_check.py b/tools/syscap_check.py index c404369390a615b29bf45dd734f323b0cc96e880..3799b79f2cfcdf61f14eb468500fa9c98537f2b4 100644 --- a/tools/syscap_check.py +++ b/tools/syscap_check.py @@ -285,7 +285,8 @@ def main(): project_path = args.project_path check_target = args.check_target bundles = args.bundles - syscap_define_path = os.path.join(project_path, "developtools", "syscap_codec", "include", "syscap_define.h") + syscap_define_path = os.path.join(project_path, "developtools", "syscap_codec", "include", + "codec_config", "syscap_define.h") ts_path = os.path.join(project_path, "interface", "sdk-js", "api") component_black_dirs = ("out",) bundle_syscap_heirarchy = ("component", "syscap")