From 8b5239685b68ba68ddd6a8c91ea934761cfe406d Mon Sep 17 00:00:00 2001 From: steven_q Date: Wed, 1 Jun 2022 16:01:44 +0800 Subject: [PATCH 01/13] add syscap Signed-off-by: steven_q Change-Id: Ib7a2ca15545ef4c4da044ac4921847770798100e --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index d7ceb8f..54741bb 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -133,6 +133,7 @@ typedef enum SystemCapabilityNum { RESOURCESCHEDULE_USAGESTATISTICS_APPGROUP, RESOURCESCHEDULE_WORKSCHEDULER, SECURITY_ACCESSTOKEN, + SECURITY_DLP_PERMISSION_SERVICE, SECURITY_APPVERIFY, SECURITY_DATATRANSITMANAGER, SECURITY_DEVICEAUTH, @@ -277,6 +278,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.ResourceSchedule.UsageStatistics.AppGroup", RESOURCESCHEDULE_USAGESTATISTICS_APPGROUP}, {"SystemCapability.ResourceSchedule.WorkScheduler", RESOURCESCHEDULE_WORKSCHEDULER}, {"SystemCapability.Security.AccessToken", SECURITY_ACCESSTOKEN}, + {"SystemCapability.Security.DlpPermissionService", SECURITY_DLP_PERMISSION_SERVICE}, {"SystemCapability.Security.AppVerify", SECURITY_APPVERIFY}, {"SystemCapability.Security.DataTransitManager", SECURITY_DATATRANSITMANAGER}, {"SystemCapability.Security.DeviceAuth", SECURITY_DEVICEAUTH}, From 4c1f797c4e18e0105cc97d21039d1e32ea057928 Mon Sep 17 00:00:00 2001 From: zhangqimiao Date: Mon, 6 Jun 2022 01:36:23 -0700 Subject: [PATCH 02/13] add_SystemCapability_msdp Signed-off-by: zhangqimiao --- include/syscap_define.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index 54741bb..eeb8310 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -99,6 +99,11 @@ typedef enum SystemCapabilityNum { MISCSERVICES_UPLOAD, MISCSERVICES_WALLPAPER, MSDP_DEVICESTATUS, + MSDP_GEOFENCE, + MSDP_MOTION, + MSDP_MOVEMENT, + MSDP_SPATIALAWARENESS, + MSDP_TIMELINE, MULTIMEDIA_MEDIALIBRARY, MULTIMEDIA_MEDIA_AUDIOPLAYER, MULTIMEDIA_MEDIA_AUDIORECORDER, @@ -244,6 +249,11 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.MiscServices.Upload", MISCSERVICES_UPLOAD}, {"SystemCapability.MiscServices.Wallpaper", MISCSERVICES_WALLPAPER}, {"SystemCapability.Msdp.DeviceStatus", MSDP_DEVICESTATUS}, + {"SystemCapability.Msdp.Geofence", MSDP_GEOFENCE}, + {"SystemCapability.Msdp.Motion", MSDP_MOTION}, + {"SystemCapability.Msdp.Movement", MSDP_MOVEMENT}, + {"SystemCapability.Msdp.SpatialAwareness", MSDP_SPATIALAWARENESS}, + {"SystemCapability.Msdp.Timeline", MSDP_TIMELINE}, {"SystemCapability.Multimedia.MediaLibrary", MULTIMEDIA_MEDIALIBRARY}, {"SystemCapability.Multimedia.Media.AudioPlayer", MULTIMEDIA_MEDIA_AUDIOPLAYER}, {"SystemCapability.Multimedia.Media.AudioRecorder", MULTIMEDIA_MEDIA_AUDIORECORDER}, From d3cbdf12ce0835d3b9c805c8428c9a944bedf952 Mon Sep 17 00:00:00 2001 From: tangfan Date: Tue, 7 Jun 2022 16:39:20 +0800 Subject: [PATCH 03/13] add distributedinput config Signed-off-by: tangfan --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index eeb8310..99144ee 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -60,6 +60,7 @@ typedef enum SystemCapabilityNum { DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA, DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK, DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN, + DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT, FILEMANAGEMENT_FILEMANAGERSERVICE, FILEMANAGEMENT_REMOTEFILESHARE, FILEMANAGEMENT_STORAGESERVICE_BACKUP, @@ -210,6 +211,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.distributedhardware.distributed_camera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, {"SystemCapability.distributedhardware.distributed_hardware_fwk", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, {"SystemCapability.distributedhardware.distributed_screen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, + {"SystemCapability.distributedhardware.distributed_input", DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT}, {"SystemCapability.FileManagement.FileManagerService", FILEMANAGEMENT_FILEMANAGERSERVICE}, {"SystemCapability.FileManagement.RemoteFileShare", FILEMANAGEMENT_REMOTEFILESHARE}, {"SystemCapability.FileManagement.StorageService.Backup", FILEMANAGEMENT_STORAGESERVICE_BACKUP}, From 01f5eeb3b7a9cb3b0fce1f4410da763508b9b945 Mon Sep 17 00:00:00 2001 From: tangfan Date: Tue, 7 Jun 2022 20:18:04 +0800 Subject: [PATCH 04/13] fix distributed_input to DistributedInput Signed-off-by: tangfan --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 99144ee..8388944 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -211,7 +211,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.distributedhardware.distributed_camera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, {"SystemCapability.distributedhardware.distributed_hardware_fwk", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, {"SystemCapability.distributedhardware.distributed_screen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, - {"SystemCapability.distributedhardware.distributed_input", DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT}, + {"SystemCapability.distributedhardware.DistributedInput", DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT}, {"SystemCapability.FileManagement.FileManagerService", FILEMANAGEMENT_FILEMANAGERSERVICE}, {"SystemCapability.FileManagement.RemoteFileShare", FILEMANAGEMENT_REMOTEFILESHARE}, {"SystemCapability.FileManagement.StorageService.Backup", FILEMANAGEMENT_STORAGESERVICE_BACKUP}, From bdd1be6b96232cb73982dbb624d5c802b4e1e77d Mon Sep 17 00:00:00 2001 From: tangfan Date: Tue, 7 Jun 2022 20:24:27 +0800 Subject: [PATCH 05/13] fix distributedhardware to DistributedHardware Signed-off-by: tangfan --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 8388944..9d05a93 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -211,7 +211,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.distributedhardware.distributed_camera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, {"SystemCapability.distributedhardware.distributed_hardware_fwk", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, {"SystemCapability.distributedhardware.distributed_screen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, - {"SystemCapability.distributedhardware.DistributedInput", DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT}, + {"SystemCapability.DistributedHardware.DistributedInput", DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT}, {"SystemCapability.FileManagement.FileManagerService", FILEMANAGEMENT_FILEMANAGERSERVICE}, {"SystemCapability.FileManagement.RemoteFileShare", FILEMANAGEMENT_REMOTEFILESHARE}, {"SystemCapability.FileManagement.StorageService.Backup", FILEMANAGEMENT_STORAGESERVICE_BACKUP}, From 6e6638076987d44084b60e8117f52b49f810f55e Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 7 Jun 2022 20:42:40 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=B8=83?= =?UTF-8?q?=E5=BC=8F=E5=B1=8F=E5=B9=95syscap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index eeb8310..e137225 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -209,7 +209,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.DistributedHardware.DeviceManager", DISTRIBUTEDHARDWARE_DEVICEMANAGER}, {"SystemCapability.distributedhardware.distributed_camera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, {"SystemCapability.distributedhardware.distributed_hardware_fwk", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, - {"SystemCapability.distributedhardware.distributed_screen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, + {"SystemCapability.Distributedhardware.DistributedScreen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, {"SystemCapability.FileManagement.FileManagerService", FILEMANAGEMENT_FILEMANAGERSERVICE}, {"SystemCapability.FileManagement.RemoteFileShare", FILEMANAGEMENT_REMOTEFILESHARE}, {"SystemCapability.FileManagement.StorageService.Backup", FILEMANAGEMENT_STORAGESERVICE_BACKUP}, From 4b993a5ef757ddb116ce9a54ac83d7c5906f8f55 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Wed, 8 Jun 2022 10:28:51 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangchaole --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 9d05a93..bc3cc21 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -208,7 +208,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.DistributedDataManager.Preferences.Core", DISTRIBUTEDDATAMANAGER_PREFERENCES_CORE}, {"SystemCapability.DistributedDataManager.RelationalStore.Core", DISTRIBUTEDDATAMANAGER_RELATIONALSTORE_CORE}, {"SystemCapability.DistributedHardware.DeviceManager", DISTRIBUTEDHARDWARE_DEVICEMANAGER}, - {"SystemCapability.distributedhardware.distributed_camera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, + {"SystemCapability.distributedhardware.DistributedCamera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, {"SystemCapability.distributedhardware.distributed_hardware_fwk", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, {"SystemCapability.distributedhardware.distributed_screen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, {"SystemCapability.DistributedHardware.DistributedInput", DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT}, From 739fee8a2b428b553e1257fa31f20fb43ca6680e Mon Sep 17 00:00:00 2001 From: wangchaole Date: Wed, 8 Jun 2022 10:39:58 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangchaole --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index bc3cc21..dba1110 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -208,7 +208,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.DistributedDataManager.Preferences.Core", DISTRIBUTEDDATAMANAGER_PREFERENCES_CORE}, {"SystemCapability.DistributedDataManager.RelationalStore.Core", DISTRIBUTEDDATAMANAGER_RELATIONALSTORE_CORE}, {"SystemCapability.DistributedHardware.DeviceManager", DISTRIBUTEDHARDWARE_DEVICEMANAGER}, - {"SystemCapability.distributedhardware.DistributedCamera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, + {"SystemCapability.DistributedHardware.DistributedCamera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, {"SystemCapability.distributedhardware.distributed_hardware_fwk", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, {"SystemCapability.distributedhardware.distributed_screen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, {"SystemCapability.DistributedHardware.DistributedInput", DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT}, From 42dc9f80df13d06f861769e1af181c21d47526b6 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Wed, 8 Jun 2022 10:45:02 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index e137225..d9d6a63 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -209,7 +209,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.DistributedHardware.DeviceManager", DISTRIBUTEDHARDWARE_DEVICEMANAGER}, {"SystemCapability.distributedhardware.distributed_camera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, {"SystemCapability.distributedhardware.distributed_hardware_fwk", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, - {"SystemCapability.Distributedhardware.DistributedScreen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, + {"SystemCapability.DistributedHardware.DistributedScreen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, {"SystemCapability.FileManagement.FileManagerService", FILEMANAGEMENT_FILEMANAGERSERVICE}, {"SystemCapability.FileManagement.RemoteFileShare", FILEMANAGEMENT_REMOTEFILESHARE}, {"SystemCapability.FileManagement.StorageService.Backup", FILEMANAGEMENT_STORAGESERVICE_BACKUP}, From 94afeda8461de942c284aa93a2ae3c1798254d6d Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 9 Jun 2022 14:49:16 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=B8=83?= =?UTF-8?q?=E5=BC=8F=E7=A1=AC=E4=BB=B6=E6=A1=86=E6=9E=B6syscap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index e647dfd..3d859ab 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -209,7 +209,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.DistributedDataManager.RelationalStore.Core", DISTRIBUTEDDATAMANAGER_RELATIONALSTORE_CORE}, {"SystemCapability.DistributedHardware.DeviceManager", DISTRIBUTEDHARDWARE_DEVICEMANAGER}, {"SystemCapability.DistributedHardware.DistributedCamera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, - {"SystemCapability.distributedhardware.distributed_hardware_fwk", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, + {"SystemCapability.DistributedHardware.DistributedHardwareFWK", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, {"SystemCapability.DistributedHardware.DistributedScreen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, {"SystemCapability.DistributedHardware.DistributedInput", DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT}, {"SystemCapability.FileManagement.FileManagerService", FILEMANAGEMENT_FILEMANAGERSERVICE}, From 1ea71bcec24e77bb53bc00b39120e9e3cf7d5c96 Mon Sep 17 00:00:00 2001 From: benb365 Date: Mon, 13 Jun 2022 16:16:32 +0800 Subject: [PATCH 11/13] Add syscap ace_ui_appearance Signed-off-by: benb365 --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index 3d859ab..754a59a 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -26,6 +26,7 @@ typedef enum SystemCapabilityNum { ACCOUNT_APPACCOUNT, ACCOUNT_OSACCOUNT, ACE_ACEENGINELITE, + ACE_UI_APPEARANCE, AI_AIENGINE, APPLICATIONS_CONTACTSDATA, BARRIERFREE_ACCESSIBILITY_CORE, @@ -176,6 +177,7 @@ typedef enum SystemCapabilityNum { static SyscapWithNum arraySyscap[] = { {"SystemCapability.Account.AppAccount", ACCOUNT_APPACCOUNT}, {"SystemCapability.Account.OsAccount", ACCOUNT_OSACCOUNT}, + {"SystemCapability.Ace.UiAppearance", ACE_UI_APPEARANCE}, {"SystemCapability.Ace.AceEngineLite", ACE_ACEENGINELITE}, {"SystemCapability.Ai.AiEngine", AI_AIENGINE}, {"SystemCapability.Applications.ContactsData", APPLICATIONS_CONTACTSDATA}, From 08855ec7f1b80abf18b1cc88cc1f69b64e62a73c Mon Sep 17 00:00:00 2001 From: yudechen Date: Fri, 17 Jun 2022 15:47:39 +0800 Subject: [PATCH 12/13] change max syscap string len form 128 to 256. Signed-off-by: yudechen Change-Id: I8f47a5768167f38a474e9c67caed15422272321d --- include/syscap_define.h | 2 +- src/create_pcid.c | 21 ++++++++++----------- src/syscap_tool.c | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index d7ceb8f..aa1bcfc 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -17,7 +17,7 @@ #define _SYSCAP_DEFINE_H typedef struct SystemCapabilityWithNum { - char syscapStr[128]; + char syscapStr[256]; uint16_t num; } SyscapWithNum; diff --git a/src/create_pcid.c b/src/create_pcid.c index 6217c42..ad58fc8 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -30,8 +30,7 @@ #include "syscap_define.h" #include "create_pcid.h" -#define SINGLE_FEAT_LENGTH (32 * 8) -#define PER_SYSCAP_LEN_MAX 128 +#define SINGLE_SYSCAP_LEN 256 #define PCID_OUT_BUFFER 32 #define PRIVATE_SYSCAP_SIZE 1000 #define UINT8_BIT 8 @@ -423,9 +422,9 @@ int32_t DecodePCID(char *inputFile, char *outDirPath) char *ptrPrivateSyscap = (char *)(pcidMain + 1); uint16_t privateSyscapLen = contextBufLen - sizeof(PCIDMain) - 1; - char priSyscapStr[PER_SYSCAP_LEN_MAX] = {0}; + char priSyscapStr[SINGLE_SYSCAP_LEN] = {0}; char *tempPriSyscapStr = priSyscapStr; - char fullPriSyscapStr[PER_SYSCAP_LEN_MAX] = {0}; + char fullPriSyscapStr[SINGLE_SYSCAP_LEN] = {0}; if (privateSyscapLen < 0) { PRINT_ERR("parse private syscap failed."); ret = -1; @@ -437,7 +436,7 @@ int32_t DecodePCID(char *inputFile, char *outDirPath) while (*ptrPrivateSyscap != '\0') { if (*ptrPrivateSyscap == ',') { *tempPriSyscapStr = '\0'; - ret = sprintf_s(fullPriSyscapStr, PER_SYSCAP_LEN_MAX, "SystemCapability.%s", priSyscapStr); + ret = sprintf_s(fullPriSyscapStr, SINGLE_SYSCAP_LEN, "SystemCapability.%s", priSyscapStr); if (ret == -1) { printf("sprintf_s failed\n"); goto FREE_VECTOR_OUT; @@ -761,19 +760,19 @@ int32_t DecodePcidToString(char *inputFile, char *outDirPath) if (priSyscapCount == 0) { goto OUT_PUT; } - priSyscapFull = (char *)malloc(priSyscapCount * SINGLE_FEAT_LENGTH); + priSyscapFull = (char *)malloc(priSyscapCount * SINGLE_SYSCAP_LEN); if (priSyscapFull == NULL) { PRINT_ERR("malloc failed\n"); goto FREE_PRISYSCAP_FULL; } - (void)memset_s(priSyscapFull, priSyscapCount * SINGLE_FEAT_LENGTH, - 0, priSyscapCount * SINGLE_FEAT_LENGTH); - char tempSyscap[SINGLE_FEAT_LENGTH] = {0}; + (void)memset_s(priSyscapFull, priSyscapCount * SINGLE_SYSCAP_LEN, + 0, priSyscapCount * SINGLE_SYSCAP_LEN); + char tempSyscap[SINGLE_SYSCAP_LEN] = {0}; char *temp = tempSyscap; for (i = 0, j = 0; i < privateSyscapLen; i++) { if (*privateSyscap == ',') { *temp = '\0'; - ret = sprintf_s(priSyscapFull + j * SINGLE_FEAT_LENGTH, SINGLE_FEAT_LENGTH, + ret = sprintf_s(priSyscapFull + j * SINGLE_SYSCAP_LEN, SINGLE_SYSCAP_LEN, "SystemCapability.%s", tempSyscap); if (ret == -1) { PRINT_ERR("sprintf_s failed\n"); @@ -809,7 +808,7 @@ OUT_PUT: } } for (i = 0; i < priSyscapCount; i++) { - ret = sprintf_s(output, outputLen, "%s,%s", output, priSyscapFull + i * SINGLE_FEAT_LENGTH); + ret = sprintf_s(output, outputLen, "%s,%s", output, priSyscapFull + i * SINGLE_SYSCAP_LEN); if (ret == -1) { PRINT_ERR("sprintf_s failed\n"); goto FREE_OUTPUT; diff --git a/src/syscap_tool.c b/src/syscap_tool.c index 2879c0c..75a161d 100644 --- a/src/syscap_tool.c +++ b/src/syscap_tool.c @@ -44,7 +44,7 @@ typedef struct RequiredProductCompatibilityIDHead { uint16_t apiVersionType : 1; } RPCIDHead; -#define SINGLE_SYSCAP_LEN 128 +#define SINGLE_SYSCAP_LEN 256 #define SYSCAP_PREFIX_LEN 17 #define SINGLE_FEAT_LEN (SINGLE_SYSCAP_LEN - SYSCAP_PREFIX_LEN) #define UINT8_BIT 8 From 3b58705ddb911700d9ca2a1f84be8e3c39b73244 Mon Sep 17 00:00:00 2001 From: fengzewu Date: Thu, 23 Jun 2022 08:53:05 +0800 Subject: [PATCH 13/13] Add Image Creator feature Signed-off-by: fengzewu --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index 57af4ca..3589652 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -117,6 +117,7 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_IMAGE_IMAGESOURCE, MULTIMEDIA_IMAGE_IMAGEPACKER, MULTIMEDIA_IMAGE_IMAGERECEIVER, + MULTIMEDIA_IMAGE_IMAGECREATOR, MULTIMEDIA_MEDIA_SPLITER, MULTIMEDIA_MEDIA_VIDEOPLAYER, MULTIMEDIA_MEDIA_VIDEORECORDER, @@ -269,6 +270,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.Multimedia.Image.ImageSource", MULTIMEDIA_IMAGE_IMAGESOURCE}, {"SystemCapability.Multimedia.Image.ImagePacker", MULTIMEDIA_IMAGE_IMAGEPACKER}, {"SystemCapability.Multimedia.Image.ImageReceiver", MULTIMEDIA_IMAGE_IMAGERECEIVER}, + {"SystemCapability.Multimedia.Image.ImageCreator", MULTIMEDIA_IMAGE_IMAGECREATOR}, {"SystemCapability.Multimedia.Media.Spliter", MULTIMEDIA_MEDIA_SPLITER}, {"SystemCapability.Multimedia.Media.VideoPlayer", MULTIMEDIA_MEDIA_VIDEOPLAYER}, {"SystemCapability.Multimedia.Media.VideoRecorder", MULTIMEDIA_MEDIA_VIDEORECORDER},