From a1f4eb3dda6bfa23f38b99d3eccc96f34c241325 Mon Sep 17 00:00:00 2001 From: chenshuai Date: Thu, 21 Sep 2023 19:57:02 +0800 Subject: [PATCH 1/4] modify oaid syscap Signed-off-by: chenshuai --- 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 a743205..eee1d8e 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, - CLOUD_OAID, + ADVERTISING_OAID, XTS_DEVICEATTEST, XTS_DEVICEATTESTLITE, MULTIMEDIA_MEDIA_AVPLAYER, @@ -554,7 +554,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.Cloud.OAID", CLOUD_OAID}, + {"SystemCapability.ADVERTISING.OAID", ADVERTISING_OAID}, {"SystemCapability.XTS.DeviceAttest", XTS_DEVICEATTEST}, {"SystemCapability.XTS.DeviceAttestLite", XTS_DEVICEATTESTLITE}, {"SystemCapability.Multimedia.Media.AVPlayer", MULTIMEDIA_MEDIA_AVPLAYER}, -- Gitee From 5a005c035905301640433fbaf9bd6f3cf90adce4 Mon Sep 17 00:00:00 2001 From: chenshuai Date: Thu, 21 Sep 2023 20:19:49 +0800 Subject: [PATCH 2/4] modify oaid syscap Signed-off-by: chenshuai --- include/codec_config/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index eee1d8e..f70acad 100755 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -554,7 +554,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.Advertising.OAID", ADVERTISING_OAID}, {"SystemCapability.XTS.DeviceAttest", XTS_DEVICEATTEST}, {"SystemCapability.XTS.DeviceAttestLite", XTS_DEVICEATTESTLITE}, {"SystemCapability.Multimedia.Media.AVPlayer", MULTIMEDIA_MEDIA_AVPLAYER}, -- Gitee From 37c013c75e74a8ea1109341180a59c88a7801638 Mon Sep 17 00:00:00 2001 From: chenshuai Date: Fri, 22 Sep 2023 09:19:03 +0800 Subject: [PATCH 3/4] modify oaid syscap Signed-off-by: chenshuai --- include/codec_config/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index f70acad..c63b12d 100755 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -265,6 +265,7 @@ typedef enum SystemCapabilityNum { COMMUNICATION_NFC_TAG, COMMUNICATION_NFC_CARDEMULATION, SECURITY_CERT, + CLOUD_OAID, ADVERTISING_OAID, XTS_DEVICEATTEST, XTS_DEVICEATTESTLITE, @@ -554,6 +555,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.Cloud.OAID", CLOUD_OAID}, {"SystemCapability.Advertising.OAID", ADVERTISING_OAID}, {"SystemCapability.XTS.DeviceAttest", XTS_DEVICEATTEST}, {"SystemCapability.XTS.DeviceAttestLite", XTS_DEVICEATTESTLITE}, -- Gitee From a5d60f83083a365655f5d9713e9052f516af8801 Mon Sep 17 00:00:00 2001 From: chenshuai Date: Fri, 22 Sep 2023 09:31:42 +0800 Subject: [PATCH 4/4] modify oaid syscap Signed-off-by: chenshuai --- 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 c63b12d..90a9fb9 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, CLOUD_OAID, - ADVERTISING_OAID, XTS_DEVICEATTEST, XTS_DEVICEATTESTLITE, MULTIMEDIA_MEDIA_AVPLAYER, @@ -305,6 +304,7 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_MEDIA_SOUNDPOOL, SECURITY_DATALOSSPREVENTION, MSDP_USERSTATUSAWARENESS, + ADVERTISING_OAID, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; @@ -556,7 +556,6 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Communication.NFC.CardEmulation", COMMUNICATION_NFC_CARDEMULATION}, {"SystemCapability.Security.Cert", SECURITY_CERT}, {"SystemCapability.Cloud.OAID", CLOUD_OAID}, - {"SystemCapability.Advertising.OAID", ADVERTISING_OAID}, {"SystemCapability.XTS.DeviceAttest", XTS_DEVICEATTEST}, {"SystemCapability.XTS.DeviceAttestLite", XTS_DEVICEATTESTLITE}, {"SystemCapability.Multimedia.Media.AVPlayer", MULTIMEDIA_MEDIA_AVPLAYER}, @@ -592,6 +591,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Multimedia.Media.SoundPool", MULTIMEDIA_MEDIA_SOUNDPOOL}, {"SystemCapability.Security.DataLossPrevention", SECURITY_DATALOSSPREVENTION}, {"SystemCapability.Msdp.UserStatusAwareness", MSDP_USERSTATUSAWARENESS}, + {"SystemCapability.Advertising.OAID", ADVERTISING_OAID}, }; #ifdef __cplusplus -- Gitee