openharmony/developtools_syscap_codec
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_syscap_codec.git synced 2026-08-27 02:11:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

deal code Confliction

Browse Source 
Signed-off-by: wangyulie <wanglieyu@126.com>
This commit is contained in:
wangyulie
2024-02-02 20:29:59 +08:00
parent 1ad4b05c9e 4ee8b2e61d
commit da6cccb6ad
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/codec_config/syscap_define.h
+6
View File
@@ -327,6 +327,9 @@ typedef enum SystemCapabilityNum {
MULTIMEDIA_MEDIA_AVMETADATAEXTRACTOR,
MULTIMEDIA_MEDIA_AVIMAGEGENERATOR,
MULTIMEDIA_MEDIA_AUDIOHAPTIC_CORE,
DISTRIBUTEDDATAMANAGER_CLOUDSYNC_CLIENT,
DISTRIBUTEDDATAMANAGER_CLOUDSYNC_SERVER,
DISTRIBUTEDDATAMANAGER_CLOUDSYNC_CONFIG,
RESOURCESCHEDULE_FFRT_CORE,
// Add before here
SYSCAP_BASIC_END = 500,
@@ -368,6 +371,9 @@ const static SyscapWithNum g_arraySyscap[] = {
{"SystemCapability.DistributedDataManager.Preferences.Core", DISTRIBUTEDDATAMANAGER_PREFERENCES_CORE},
{"SystemCapability.DistributedDataManager.Preferences.Core.Lite", DISTRIBUTEDDATAMANAGER_PREFERENCES_CORE_LITE},
{"SystemCapability.DistributedDataManager.RelationalStore.Core", DISTRIBUTEDDATAMANAGER_RELATIONALSTORE_CORE},
{"SystemCapability.DistributedDataManager.CloudSync.Client", DISTRIBUTEDDATAMANAGER_CLOUDSYNC_CLIENT},
{"SystemCapability.DistributedDataManager.CloudSync.Server", DISTRIBUTEDDATAMANAGER_CLOUDSYNC_SERVER},
{"SystemCapability.DistributedDataManager.CloudSync.Config", DISTRIBUTEDDATAMANAGER_CLOUDSYNC_CONFIG},
{"SystemCapability.DistributedHardware.DeviceManager", DISTRIBUTEDHARDWARE_DEVICEMANAGER},
{"SystemCapability.DistributedHardware.DistributedCamera", DISTRIBUTEDHARDWARE_DISTRIBUTEDCAMERA},
{"SystemCapability.DistributedHardware.DistributedAudio", DISTRIBUTEDHARDWARE_DISTRIBUTEDAUDIO},