From 865a1e83e0fd2102d1af1d594c21a0a9a31e57d1 Mon Sep 17 00:00:00 2001 From: houhaoyu Date: Thu, 10 Mar 2022 15:53:03 +0800 Subject: [PATCH] fixed 07cff09 from https://gitee.com/houhaoyu/interface_sdk-js/pulls/1038 houhaoyu@huawei.com update syscap Signed-off-by: houhaoyu Change-Id: I573e936d4f20b1f064facf01b9cd5ece5dcfd183 --- api/device-define/car.json | 13 +------------ api/device-define/liteWearable.json | 2 +- api/device-define/pc.json | 22 ++++++---------------- api/device-define/phone.json | 22 ++++++---------------- api/device-define/router.json | 2 +- api/device-define/smartVision.json | 2 +- api/device-define/tablet.json | 22 ++++++---------------- api/device-define/tv.json | 17 +++-------------- api/device-define/wearable.json | 17 +++-------------- 9 files changed, 28 insertions(+), 91 deletions(-) diff --git a/api/device-define/car.json b/api/device-define/car.json index 809d7fa4be..05103c40dc 100644 --- a/api/device-define/car.json +++ b/api/device-define/car.json @@ -88,7 +88,7 @@ "SystemCapability.HiviewDFX.HiAppEvent", "SystemCapability.HiviewDFX.HiSysEvent", "SystemCapability.HiviewDFX.HiProfiler.HiDebug", - "SystemCapability.Update.Core", + "SystemCapability.Update.UpdateService", "SystemCapability.Security.AccessToken", "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", @@ -107,27 +107,16 @@ "SystemCapability.DistributedDataManager.RelationalStore.Synchronize", "SystemCapability.DistributedDataManager.KVStore.Core", "SystemCapability.DistributedDataManager.KVStore.DistributedKVStore", - "SystemCapability.DistributedDataManager.DataObject.Core", "SystemCapability.DistributedDataManager.DataObject.DistributedObject", "SystemCapability.DistributedDataManager.Preferences.Core", "SystemCapability.DistributedDataManager.DataShare.Core", "SystemCapability.DistributedDataManager.DataShare.Consumer", "SystemCapability.DistributedDataManager.DataShare.Provider", "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", "SystemCapability.Ability.AbilityRuntime.AbilityCore", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Mission", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", "SystemCapability.Applications.ContactsData" diff --git a/api/device-define/liteWearable.json b/api/device-define/liteWearable.json index 30bb33b1a6..8fedd7e3ec 100644 --- a/api/device-define/liteWearable.json +++ b/api/device-define/liteWearable.json @@ -11,7 +11,7 @@ "SystemCapability.HiviewDFX.HiLogLite", "SystemCapability.HiviewDFX.HiviewLite", "SystemCapability.HiviewDFX.HiEventLite", - "SystemCapability.Update.Core", + "SystemCapability.Update.UpdateService", "SystemCapability.FileManagement.File.FileIO", "SystemCapability.FileManagement.File.Environment", "SystemCapability.Startup.SystemInfo" diff --git a/api/device-define/pc.json b/api/device-define/pc.json index eca4fbce82..b246c5b4f5 100644 --- a/api/device-define/pc.json +++ b/api/device-define/pc.json @@ -37,7 +37,7 @@ "SystemCapability.MultimodalInput.Input.InputFilter", "SystemCapability.PowerManager.BatteryManager.Extension", "SystemCapability.PowerManager.BatteryStatistics", - "SystemCapability.PowerManager.DisplayManager", + "SystemCapability.PowerManager.DisplayPowerManager", "SystemCapability.PowerManager.ThermalManager", "SystemCapability.PowerManager.PowerManager.Core", "SystemCapability.PowerManager.BatteryManager.Core", @@ -94,12 +94,12 @@ "SystemCapability.HiviewDFX.HiAppEvent", "SystemCapability.HiviewDFX.HiSysEvent", "SystemCapability.HiviewDFX.HiProfiler.HiDebug", - "SystemCapability.Update.Core", + "SystemCapability.Update.UpdateService", "SystemCapability.DistributedHardware.DeviceManager", "SystemCapability.Security.DeviceAuth", "SystemCapability.Security.DataTransitManager", "SystemCapability.Security.DeviceSecurityLevel", - "SystemCapability.Security.SecurityHuks", + "SystemCapability.Security.Huks", "SystemCapability.Security.AccessToken", "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", @@ -111,9 +111,10 @@ "SystemCapability.Miscservices.InputMethodFramework", "SystemCapability.Miscservices.Pasteboard", "SystemCapability.Miscservices.Time", - "SystemCapability.Miscservices.WallpaperFramework", + "SystemCapability.Miscservices.Wallpaper", "SystemCapability.MiscServices.ScreenLock", - "SystemCapability.MiscServices.Request", + "SystemCapability.MiscServices.Upload", + "SystemCapability.MiscServices.Download", "SystemCapability.FileManagement.StorageService.Backup", "SystemCapability.FileManagement.StorageService.SpatialStatistics", "SystemCapability.FileManagement.StorageService.Volume", @@ -129,27 +130,16 @@ "SystemCapability.DistributedDataManager.RelationalStore.Synchronize", "SystemCapability.DistributedDataManager.KVStore.Core", "SystemCapability.DistributedDataManager.KVStore.DistributedKVStore", - "SystemCapability.DistributedDataManager.DataObject.Core", "SystemCapability.DistributedDataManager.DataObject.DistributedObject", "SystemCapability.DistributedDataManager.Preferences.Core", "SystemCapability.DistributedDataManager.DataShare.Core", "SystemCapability.DistributedDataManager.DataShare.Consumer", "SystemCapability.DistributedDataManager.DataShare.Provider", "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", "SystemCapability.Ability.AbilityRuntime.AbilityCore", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Mission", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", "SystemCapability.Applications.ContactsData" diff --git a/api/device-define/phone.json b/api/device-define/phone.json index e3ac0f200e..852313a6af 100644 --- a/api/device-define/phone.json +++ b/api/device-define/phone.json @@ -42,7 +42,7 @@ "SystemCapability.MultimodalInput.Input.InputFilter", "SystemCapability.PowerManager.BatteryManager.Extension", "SystemCapability.PowerManager.BatteryStatistics", - "SystemCapability.PowerManager.DisplayManager", + "SystemCapability.PowerManager.DisplayPowerManager", "SystemCapability.PowerManager.ThermalManager", "SystemCapability.PowerManager.PowerManager.Core", "SystemCapability.PowerManager.BatteryManager.Core", @@ -99,12 +99,12 @@ "SystemCapability.HiviewDFX.HiAppEvent", "SystemCapability.HiviewDFX.HiSysEvent", "SystemCapability.HiviewDFX.HiProfiler.HiDebug", - "SystemCapability.Update.Core", + "SystemCapability.Update.UpdateService", "SystemCapability.DistributedHardware.DeviceManager", "SystemCapability.Security.DeviceAuth", "SystemCapability.Security.DataTransitManager", "SystemCapability.Security.DeviceSecurityLevel", - "SystemCapability.Security.SecurityHuks", + "SystemCapability.Security.Huks", "SystemCapability.Security.AccessToken", "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", @@ -116,9 +116,10 @@ "SystemCapability.Miscservices.InputMethodFramework", "SystemCapability.Miscservices.Pasteboard", "SystemCapability.Miscservices.Time", - "SystemCapability.Miscservices.WallpaperFramework", + "SystemCapability.Miscservices.Wallpaper", "SystemCapability.MiscServices.ScreenLock", - "SystemCapability.MiscServices.Request", + "SystemCapability.MiscServices.Upload", + "SystemCapability.MiscServices.Download", "SystemCapability.FileManagement.StorageService.Backup", "SystemCapability.FileManagement.StorageService.SpatialStatistics", "SystemCapability.FileManagement.StorageService.Volume", @@ -136,27 +137,16 @@ "SystemCapability.DistributedDataManager.RelationalStore.Synchronize", "SystemCapability.DistributedDataManager.KVStore.Core", "SystemCapability.DistributedDataManager.KVStore.DistributedKVStore", - "SystemCapability.DistributedDataManager.DataObject.Core", "SystemCapability.DistributedDataManager.DataObject.DistributedObject", "SystemCapability.DistributedDataManager.Preferences.Core", "SystemCapability.DistributedDataManager.DataShare.Core", "SystemCapability.DistributedDataManager.DataShare.Consumer", "SystemCapability.DistributedDataManager.DataShare.Provider", "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", "SystemCapability.Ability.AbilityRuntime.AbilityCore", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Mission", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", "SystemCapability.Applications.ContactsData" diff --git a/api/device-define/router.json b/api/device-define/router.json index 4cd72120a6..85e9112487 100644 --- a/api/device-define/router.json +++ b/api/device-define/router.json @@ -7,7 +7,7 @@ "SystemCapability.HiviewDFX.HiLogLite", "SystemCapability.HiviewDFX.HiviewLite", "SystemCapability.HiviewDFX.HiEventLite", - "SystemCapability.Update.Core", + "SystemCapability.Update.UpdateService", "SystemCapability.FileManagement.File.FileIO", "SystemCapability.FileManagement.File.Environment", "SystemCapability.Startup.SystemInfo" diff --git a/api/device-define/smartVision.json b/api/device-define/smartVision.json index 1d22734511..ff3cfe487d 100644 --- a/api/device-define/smartVision.json +++ b/api/device-define/smartVision.json @@ -9,7 +9,7 @@ "SystemCapability.Customization.ConfigPolicy", "SystemCapability.HiviewDFX.HiLogLite", "SystemCapability.HiviewDFX.HiviewLite", - "SystemCapability.Update.Core", + "SystemCapability.Update.UpdateService", "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 e3ac0f200e..852313a6af 100644 --- a/api/device-define/tablet.json +++ b/api/device-define/tablet.json @@ -42,7 +42,7 @@ "SystemCapability.MultimodalInput.Input.InputFilter", "SystemCapability.PowerManager.BatteryManager.Extension", "SystemCapability.PowerManager.BatteryStatistics", - "SystemCapability.PowerManager.DisplayManager", + "SystemCapability.PowerManager.DisplayPowerManager", "SystemCapability.PowerManager.ThermalManager", "SystemCapability.PowerManager.PowerManager.Core", "SystemCapability.PowerManager.BatteryManager.Core", @@ -99,12 +99,12 @@ "SystemCapability.HiviewDFX.HiAppEvent", "SystemCapability.HiviewDFX.HiSysEvent", "SystemCapability.HiviewDFX.HiProfiler.HiDebug", - "SystemCapability.Update.Core", + "SystemCapability.Update.UpdateService", "SystemCapability.DistributedHardware.DeviceManager", "SystemCapability.Security.DeviceAuth", "SystemCapability.Security.DataTransitManager", "SystemCapability.Security.DeviceSecurityLevel", - "SystemCapability.Security.SecurityHuks", + "SystemCapability.Security.Huks", "SystemCapability.Security.AccessToken", "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", @@ -116,9 +116,10 @@ "SystemCapability.Miscservices.InputMethodFramework", "SystemCapability.Miscservices.Pasteboard", "SystemCapability.Miscservices.Time", - "SystemCapability.Miscservices.WallpaperFramework", + "SystemCapability.Miscservices.Wallpaper", "SystemCapability.MiscServices.ScreenLock", - "SystemCapability.MiscServices.Request", + "SystemCapability.MiscServices.Upload", + "SystemCapability.MiscServices.Download", "SystemCapability.FileManagement.StorageService.Backup", "SystemCapability.FileManagement.StorageService.SpatialStatistics", "SystemCapability.FileManagement.StorageService.Volume", @@ -136,27 +137,16 @@ "SystemCapability.DistributedDataManager.RelationalStore.Synchronize", "SystemCapability.DistributedDataManager.KVStore.Core", "SystemCapability.DistributedDataManager.KVStore.DistributedKVStore", - "SystemCapability.DistributedDataManager.DataObject.Core", "SystemCapability.DistributedDataManager.DataObject.DistributedObject", "SystemCapability.DistributedDataManager.Preferences.Core", "SystemCapability.DistributedDataManager.DataShare.Core", "SystemCapability.DistributedDataManager.DataShare.Consumer", "SystemCapability.DistributedDataManager.DataShare.Provider", "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", "SystemCapability.Ability.AbilityRuntime.AbilityCore", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Mission", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", "SystemCapability.Applications.ContactsData" diff --git a/api/device-define/tv.json b/api/device-define/tv.json index 0b63fbf3d6..107cc2a160 100644 --- a/api/device-define/tv.json +++ b/api/device-define/tv.json @@ -35,7 +35,7 @@ "SystemCapability.MultimodalInput.Input.InputConsumer", "SystemCapability.MultimodalInput.Input.InputSimulator", "SystemCapability.MultimodalInput.Input.InputFilter", - "SystemCapability.PowerManager.DisplayManager", + "SystemCapability.PowerManager.DisplayPowerManager", "SystemCapability.PowerManager.ThermalManager", "SystemCapability.PowerManager.PowerManager.Core", "SystemCapability.PowerManager.PowerManager.Extension", @@ -85,12 +85,12 @@ "SystemCapability.HiviewDFX.HiAppEvent", "SystemCapability.HiviewDFX.HiSysEvent", "SystemCapability.HiviewDFX.HiProfiler.HiDebug", - "SystemCapability.Update.Core", + "SystemCapability.Update.UpdateService", "SystemCapability.DistributedHardware.DeviceManager", "SystemCapability.Security.DeviceAuth", "SystemCapability.Security.DataTransitManager", "SystemCapability.Security.DeviceSecurityLevel", - "SystemCapability.Security.SecurityHuks", + "SystemCapability.Security.Huks", "SystemCapability.Security.AccessToken", "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", @@ -115,27 +115,16 @@ "SystemCapability.DistributedDataManager.RelationalStore.Synchronize", "SystemCapability.DistributedDataManager.KVStore.Core", "SystemCapability.DistributedDataManager.KVStore.DistributedKVStore", - "SystemCapability.DistributedDataManager.DataObject.Core", "SystemCapability.DistributedDataManager.DataObject.DistributedObject", "SystemCapability.DistributedDataManager.Preferences.Core", "SystemCapability.DistributedDataManager.DataShare.Core", "SystemCapability.DistributedDataManager.DataShare.Consumer", "SystemCapability.DistributedDataManager.DataShare.Provider", "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", "SystemCapability.Ability.AbilityRuntime.AbilityCore", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Mission", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form" ] diff --git a/api/device-define/wearable.json b/api/device-define/wearable.json index 1ae65888cd..29faba1ca7 100644 --- a/api/device-define/wearable.json +++ b/api/device-define/wearable.json @@ -35,7 +35,7 @@ "SystemCapability.MultimodalInput.Input.InputConsumer", "SystemCapability.PowerManager.BatteryManager.Extension", "SystemCapability.PowerManager.BatteryStatistics", - "SystemCapability.PowerManager.DisplayManager", + "SystemCapability.PowerManager.DisplayPowerManager", "SystemCapability.PowerManager.ThermalManager", "SystemCapability.PowerManager.PowerManager.Core", "SystemCapability.PowerManager.BatteryManager.Core", @@ -90,12 +90,12 @@ "SystemCapability.HiviewDFX.HiAppEvent", "SystemCapability.HiviewDFX.HiSysEvent", "SystemCapability.HiviewDFX.HiProfiler.HiDebug", - "SystemCapability.Update.Core", + "SystemCapability.Update.UpdateService", "SystemCapability.DistributedHardware.DeviceManager", "SystemCapability.Security.DeviceAuth", "SystemCapability.Security.DataTransitManager", "SystemCapability.Security.DeviceSecurityLevel", - "SystemCapability.Security.SecurityHuks", + "SystemCapability.Security.Huks", "SystemCapability.Security.AccessToken", "SystemCapability.Account.OsAccount", "SystemCapability.Account.AppAccount", @@ -115,27 +115,16 @@ "SystemCapability.DistributedDataManager.RelationalStore.Core", "SystemCapability.DistributedDataManager.KVStore.Core", "SystemCapability.DistributedDataManager.KVStore.DistributedKVStore", - "SystemCapability.DistributedDataManager.DataObject.Core", "SystemCapability.DistributedDataManager.DataObject.DistributedObject", "SystemCapability.DistributedDataManager.Preferences.Core", "SystemCapability.DistributedDataManager.DataShare.Core", "SystemCapability.DistributedDataManager.DataShare.Consumer", "SystemCapability.DistributedDataManager.DataShare.Provider", "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityBase", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", - "SystemCapability.Ability.AbilityRuntime.FAModel", "SystemCapability.Ability.AbilityRuntime.AbilityCore", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityRuntime.Mission", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", - "SystemCapability.Ability.AbilityRuntime.Core", "SystemCapability.Ability.AbilityTools.AbilityAssistant", "SystemCapability.Ability.Form", "SystemCapability.Applications.ContactsData" -- Gitee