From 9dc3a6e276c10e485fdde64086175aeebb41c1d2 Mon Sep 17 00:00:00 2001 From: houhaoyu Date: Tue, 22 Mar 2022 16:57:38 +0800 Subject: [PATCH] houhaoyu@huawei.com update syscap Signed-off-by: houhaoyu Change-Id: I46cb9c3e7d66b871bbeea2562bc40b9c6f544fae --- api/device-define/car.json | 9 ++++++--- api/device-define/pc.json | 8 ++++---- api/device-define/phone.json | 8 ++++---- api/device-define/router.json | 1 + api/device-define/smartVision.json | 1 + api/device-define/tablet.json | 11 ++++++----- api/device-define/tv.json | 7 +++---- api/device-define/wearable.json | 10 +++++----- api/syscapCheck/sysCapSchema.json | 8 ++++---- 9 files changed, 34 insertions(+), 29 deletions(-) diff --git a/api/device-define/car.json b/api/device-define/car.json index 05103c40dc..986005a68f 100644 --- a/api/device-define/car.json +++ b/api/device-define/car.json @@ -24,11 +24,11 @@ "SystemCapability.Communication.NetStack", "SystemCapability.Communication.WiFi.Core", "SystemCapability.Communication.WiFi.STA", - "SystemCapability.Communication.WiFi.AP", + "SystemCapability.Communication.WiFi.AP.Core", "SystemCapability.Communication.WiFi.P2P", "SystemCapability.Communication.Bluetooth.Core", "SystemCapability.Communication.Bluetooth.Lite", - "SystemCapability.Location.Location.Base", + "SystemCapability.Location.Location.Core", "SystemCapability.Location.Location.Geocoder", "SystemCapability.Location.Location.Geofence", "SystemCapability.Location.Location.Gnss", @@ -119,6 +119,9 @@ "SystemCapability.Ability.AbilityRuntime.Mission", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", - "SystemCapability.Applications.ContactsData" + "SystemCapability.Applications.ContactsData", + "SystemCapability.Applications.Contacts", + "SystemCapability.Applications.settings.Core", + "SystemCapability.Test.UiTest" ] } \ No newline at end of file diff --git a/api/device-define/pc.json b/api/device-define/pc.json index b246c5b4f5..3da8891b99 100644 --- a/api/device-define/pc.json +++ b/api/device-define/pc.json @@ -24,7 +24,7 @@ "SystemCapability.Communication.NetStack", "SystemCapability.Communication.WiFi.Core", "SystemCapability.Communication.WiFi.STA", - "SystemCapability.Communication.WiFi.AP", + "SystemCapability.Communication.WiFi.AP.Core", "SystemCapability.Communication.WiFi.P2P", "SystemCapability.Communication.Bluetooth.Core", "SystemCapability.Communication.Bluetooth.Lite", @@ -104,9 +104,7 @@ "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", "SystemCapability.UserIAM.UserAuth.Core", - "SystemCapability.UserIAM.AuthExecutorManager", "SystemCapability.UserIAM.UserAuth.PinAuth", - "SystemCapability.UserIAM.UserIdm", "SystemCapability.UserIAM.UserAuth.FaceAuth", "SystemCapability.Miscservices.InputMethodFramework", "SystemCapability.Miscservices.Pasteboard", @@ -142,6 +140,8 @@ "SystemCapability.Ability.AbilityRuntime.Mission", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", - "SystemCapability.Applications.ContactsData" + "SystemCapability.Applications.ContactsData", + "SystemCapability.Applications.Contacts", + "SystemCapability.Applications.settings.Core" ] } \ No newline at end of file diff --git a/api/device-define/phone.json b/api/device-define/phone.json index 110656a673..3e980522a5 100644 --- a/api/device-define/phone.json +++ b/api/device-define/phone.json @@ -24,11 +24,11 @@ "SystemCapability.Communication.NetStack", "SystemCapability.Communication.WiFi.Core", "SystemCapability.Communication.WiFi.STA", - "SystemCapability.Communication.WiFi.AP", + "SystemCapability.Communication.WiFi.AP.Core", "SystemCapability.Communication.WiFi.P2P", "SystemCapability.Communication.Bluetooth.Core", "SystemCapability.Communication.Bluetooth.Lite", - "SystemCapability.Location.Location.Base", + "SystemCapability.Location.Location.Core", "SystemCapability.Location.Location.Geocoder", "SystemCapability.Location.Location.Geofence", "SystemCapability.Location.Location.Gnss", @@ -109,9 +109,7 @@ "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", "SystemCapability.UserIAM.UserAuth.Core", - "SystemCapability.UserIAM.AuthExecutorManager", "SystemCapability.UserIAM.UserAuth.PinAuth", - "SystemCapability.UserIAM.UserIdm", "SystemCapability.UserIAM.UserAuth.FaceAuth", "SystemCapability.Miscservices.InputMethodFramework", "SystemCapability.Miscservices.Pasteboard", @@ -150,6 +148,8 @@ "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", "SystemCapability.Applications.ContactsData", + "SystemCapability.Applications.Contacts", + "SystemCapability.Applications.settings.Core", "SystemCapability.Test.UiTest" ] } diff --git a/api/device-define/router.json b/api/device-define/router.json index 85e9112487..c06caa45a6 100644 --- a/api/device-define/router.json +++ b/api/device-define/router.json @@ -1,6 +1,7 @@ { "SysCaps": [ "SystemCapability.Communication.SoftBus.Core", + "SystemCapability.Communication.WiFi.AP.Extension", "SystemCapability.PowerManager.PowerManager.Lite", "SystemCapability.PowerManager.BatteryManager.Lite", "SystemCapability.Customization.ConfigPolicy", diff --git a/api/device-define/smartVision.json b/api/device-define/smartVision.json index ff3cfe487d..a569e71df9 100644 --- a/api/device-define/smartVision.json +++ b/api/device-define/smartVision.json @@ -10,6 +10,7 @@ "SystemCapability.HiviewDFX.HiLogLite", "SystemCapability.HiviewDFX.HiviewLite", "SystemCapability.Update.UpdateService", + "SystemCapability.Security.Cipher", "SystemCapability.FileManagement.File.FileIO", "SystemCapability.FileManagement.File.Environment", "SystemCapability.Startup.SystemInfo" diff --git a/api/device-define/tablet.json b/api/device-define/tablet.json index 852313a6af..eb35fabc71 100644 --- a/api/device-define/tablet.json +++ b/api/device-define/tablet.json @@ -24,11 +24,11 @@ "SystemCapability.Communication.NetStack", "SystemCapability.Communication.WiFi.Core", "SystemCapability.Communication.WiFi.STA", - "SystemCapability.Communication.WiFi.AP", + "SystemCapability.Communication.WiFi.AP.Core", "SystemCapability.Communication.WiFi.P2P", "SystemCapability.Communication.Bluetooth.Core", "SystemCapability.Communication.Bluetooth.Lite", - "SystemCapability.Location.Location.Base", + "SystemCapability.Location.Location.Core", "SystemCapability.Location.Location.Geocoder", "SystemCapability.Location.Location.Geofence", "SystemCapability.Location.Location.Gnss", @@ -109,9 +109,7 @@ "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", "SystemCapability.UserIAM.UserAuth.Core", - "SystemCapability.UserIAM.AuthExecutorManager", "SystemCapability.UserIAM.UserAuth.PinAuth", - "SystemCapability.UserIAM.UserIdm", "SystemCapability.UserIAM.UserAuth.FaceAuth", "SystemCapability.Miscservices.InputMethodFramework", "SystemCapability.Miscservices.Pasteboard", @@ -149,6 +147,9 @@ "SystemCapability.Ability.AbilityRuntime.Mission", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", - "SystemCapability.Applications.ContactsData" + "SystemCapability.Applications.ContactsData", + "SystemCapability.Applications.Contacts", + "SystemCapability.Applications.settings.Core", + "SystemCapability.Test.UiTest" ] } \ No newline at end of file diff --git a/api/device-define/tv.json b/api/device-define/tv.json index 107cc2a160..69a879c2ce 100644 --- a/api/device-define/tv.json +++ b/api/device-define/tv.json @@ -24,7 +24,7 @@ "SystemCapability.Communication.NetStack", "SystemCapability.Communication.WiFi.Core", "SystemCapability.Communication.WiFi.STA", - "SystemCapability.Communication.WiFi.AP", + "SystemCapability.Communication.WiFi.AP.Core", "SystemCapability.Communication.WiFi.P2P", "SystemCapability.Communication.Bluetooth.Core", "SystemCapability.Communication.Bluetooth.Lite", @@ -95,9 +95,7 @@ "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", "SystemCapability.UserIAM.UserAuth.Core", - "SystemCapability.UserIAM.AuthExecutorManager", "SystemCapability.UserIAM.UserAuth.PinAuth", - "SystemCapability.UserIAM.UserIdm", "SystemCapability.UserIAM.UserAuth.FaceAuth", "SystemCapability.Miscservices.Time", "SystemCapability.FileManagement.StorageService.Backup", @@ -126,6 +124,7 @@ "SystemCapability.Ability.AbilityRuntime.AbilityCore", "SystemCapability.Ability.AbilityRuntime.Mission", "SystemCapability.Ability.AbilityTools.AbilityAssistant", - "SystemCapability.Ability.Form" + "SystemCapability.Ability.Form", + "SystemCapability.Applications.settings.Core" ] } \ No newline at end of file diff --git a/api/device-define/wearable.json b/api/device-define/wearable.json index 29faba1ca7..c2c27a542f 100644 --- a/api/device-define/wearable.json +++ b/api/device-define/wearable.json @@ -22,11 +22,11 @@ "SystemCapability.Communication.NetStack", "SystemCapability.Communication.WiFi.Core", "SystemCapability.Communication.WiFi.STA", - "SystemCapability.Communication.WiFi.AP", + "SystemCapability.Communication.WiFi.AP.Core", "SystemCapability.Communication.WiFi.P2P", "SystemCapability.Communication.Bluetooth.Core", "SystemCapability.Communication.Bluetooth.Lite", - "SystemCapability.Location.Location.Base", + "SystemCapability.Location.Location.Core", "SystemCapability.Location.Location.Geocoder", "SystemCapability.Location.Location.Geofence", "SystemCapability.Location.Location.Gnss", @@ -100,9 +100,7 @@ "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", "SystemCapability.UserIAM.UserAuth.Core", - "SystemCapability.UserIAM.AuthExecutorManager", "SystemCapability.UserIAM.UserAuth.PinAuth", - "SystemCapability.UserIAM.UserIdm", "SystemCapability.UserIAM.UserAuth.FaceAuth", "SystemCapability.Miscservices.Time", "SystemCapability.FileManagement.StorageService.SpatialStatistics", @@ -127,6 +125,8 @@ "SystemCapability.Ability.AbilityRuntime.Mission", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", - "SystemCapability.Applications.ContactsData" + "SystemCapability.Applications.ContactsData", + "SystemCapability.Applications.Contacts", + "SystemCapability.Applications.settings.Core" ] } \ No newline at end of file diff --git a/api/syscapCheck/sysCapSchema.json b/api/syscapCheck/sysCapSchema.json index 586d6b250a..2060ea3812 100644 --- a/api/syscapCheck/sysCapSchema.json +++ b/api/syscapCheck/sysCapSchema.json @@ -54,7 +54,7 @@ "type": "array", "items": { "type": "string", - "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+)?$" + "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+){0,2}$" } } } @@ -75,7 +75,7 @@ "type": "array", "items": { "type": "string", - "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+)?$" + "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+){0,2}$" } } } @@ -94,14 +94,14 @@ "type": "array", "items": { "type": "string", - "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+)?$" + "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+){0,2}$" } }, "removedSysCaps": { "type": "array", "items": { "type": "string", - "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+)?$" + "pattern": "^SystemCapability\\.[a-zA-Z0-9]+\\.[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+){0,2}$" } } } -- Gitee