From f6b05597c37a2d9b30a478fc7051088a16253824 Mon Sep 17 00:00:00 2001 From: chenshuai Date: Tue, 19 Sep 2023 10:09:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9syscap=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E5=AD=B5=E5=8C=96=E4=BB=93=E8=81=94=E5=90=88=E6=9E=84?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshuai --- include/codec_config/syscap_define.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index fdf3de9..dd94e33 100755 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -265,7 +265,8 @@ typedef enum SystemCapabilityNum { COMMUNICATION_NFC_TAG, COMMUNICATION_NFC_CARDEMULATION, SECURITY_CERT, - CLOUD_OAID, + ADVERTISING_OAID, + ADVERTISING_ADS, XTS_DEVICEATTEST, XTS_DEVICEATTESTLITE, MULTIMEDIA_MEDIA_AVPLAYER, @@ -553,7 +554,8 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Communication.NFC.Tag", COMMUNICATION_NFC_TAG}, {"SystemCapability.Communication.NFC.CardEmulation", COMMUNICATION_NFC_CARDEMULATION}, {"SystemCapability.Security.Cert", SECURITY_CERT}, - {"SystemCapability.Cloud.OAID", CLOUD_OAID}, + {"SystemCapability.Advertising.OAID", ADVERTISING_OAID}, + {"SystemCapability.Advertising.Ads", ADVERTISING_ADS}, {"SystemCapability.XTS.DeviceAttest", XTS_DEVICEATTEST}, {"SystemCapability.XTS.DeviceAttestLite", XTS_DEVICEATTESTLITE}, {"SystemCapability.Multimedia.Media.AVPlayer", MULTIMEDIA_MEDIA_AVPLAYER}, -- Gitee From 05e7245902cb870c0f9ea58112c76db61dd137f5 Mon Sep 17 00:00:00 2001 From: chenshuai Date: Wed, 20 Sep 2023 09:34:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9syscap=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E5=AD=B5=E5=8C=96=E4=BB=93=E8=81=94=E5=90=88=E6=9E=84?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenshuai --- include/codec_config/syscap_define.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index dd94e33..fcd7379 100755 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -266,7 +266,6 @@ typedef enum SystemCapabilityNum { COMMUNICATION_NFC_CARDEMULATION, SECURITY_CERT, ADVERTISING_OAID, - ADVERTISING_ADS, XTS_DEVICEATTEST, XTS_DEVICEATTESTLITE, MULTIMEDIA_MEDIA_AVPLAYER, @@ -297,7 +296,7 @@ typedef enum SystemCapabilityNum { FILEMANAGEMENT_FILE_FILEIO_LITE, MULTIMEDIA_AVSESSION_AVCAST, STARTUP_SYSTEMINFO_LITE, - CLOUD_ADS, + ADVERTISING_ADS, MULTIMEDIA_AUDIO_PLAYBACKCAPTURE, MULTIMEDIA_MEDIA_AVSCREENCAPTURE, AI_INTELLIGENTVOICE_CORE, @@ -555,7 +554,6 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Communication.NFC.CardEmulation", COMMUNICATION_NFC_CARDEMULATION}, {"SystemCapability.Security.Cert", SECURITY_CERT}, {"SystemCapability.Advertising.OAID", ADVERTISING_OAID}, - {"SystemCapability.Advertising.Ads", ADVERTISING_ADS}, {"SystemCapability.XTS.DeviceAttest", XTS_DEVICEATTEST}, {"SystemCapability.XTS.DeviceAttestLite", XTS_DEVICEATTESTLITE}, {"SystemCapability.Multimedia.Media.AVPlayer", MULTIMEDIA_MEDIA_AVPLAYER}, @@ -583,7 +581,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Security.Huks.Extension", SECURITY_HUKS_EXTENSION}, {"SystemCapability.Sensors.MiscDevice.Lite", SENSORS_MISCDEVICE_LITE}, {"SystemCapability.FileManagement.File.FileIO.Lite", FILEMANAGEMENT_FILE_FILEIO_LITE}, - {"SystemCapability.Cloud.Ads", CLOUD_ADS}, + {"SystemCapability.Advertising.Ads", ADVERTISING_ADS}, {"SystemCapability.Multimedia.Audio.PlaybackCapture", MULTIMEDIA_AUDIO_PLAYBACKCAPTURE}, {"SystemCapability.Multimedia.Media.AVScreenCapture", MULTIMEDIA_MEDIA_AVSCREENCAPTURE}, {"SystemCapability.AI.IntelligentVoice.Core", AI_INTELLIGENTVOICE_CORE}, -- Gitee From 93827b375773804e40fd3ec00ebbe05c8f7b0c9d Mon Sep 17 00:00:00 2001 From: guochao Date: Sat, 7 Oct 2023 09:33:27 +0000 Subject: [PATCH 3/3] update include/codec_config/syscap_define.h. Signed-off-by: guochao --- include/codec_config/syscap_define.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index fcd7379..5693e19 100755 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -265,7 +265,7 @@ typedef enum SystemCapabilityNum { COMMUNICATION_NFC_TAG, COMMUNICATION_NFC_CARDEMULATION, SECURITY_CERT, - ADVERTISING_OAID, + CLOUD_OAID, XTS_DEVICEATTEST, XTS_DEVICEATTESTLITE, MULTIMEDIA_MEDIA_AVPLAYER, @@ -553,7 +553,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Communication.NFC.Tag", COMMUNICATION_NFC_TAG}, {"SystemCapability.Communication.NFC.CardEmulation", COMMUNICATION_NFC_CARDEMULATION}, {"SystemCapability.Security.Cert", SECURITY_CERT}, - {"SystemCapability.Advertising.OAID", ADVERTISING_OAID}, + {"SystemCapability.Cloud.OAID", CLOUD_OAID}, {"SystemCapability.XTS.DeviceAttest", XTS_DEVICEATTEST}, {"SystemCapability.XTS.DeviceAttestLite", XTS_DEVICEATTESTLITE}, {"SystemCapability.Multimedia.Media.AVPlayer", MULTIMEDIA_MEDIA_AVPLAYER}, -- Gitee