From 5676f9fcc4d1717d09f2f398f59b042a24497ea5 Mon Sep 17 00:00:00 2001 From: chen Date: Thu, 6 Jan 2022 18:00:41 +0800 Subject: [PATCH] delete definition Signed-off-by: chen --- .../include/system_ability_definition.h | 260 ------------------ services/samgr/native/test/unittest/BUILD.gn | 5 +- 2 files changed, 4 insertions(+), 261 deletions(-) delete mode 100755 interfaces/innerkits/samgr_proxy/include/system_ability_definition.h mode change 100644 => 100755 services/samgr/native/test/unittest/BUILD.gn diff --git a/interfaces/innerkits/samgr_proxy/include/system_ability_definition.h b/interfaces/innerkits/samgr_proxy/include/system_ability_definition.h deleted file mode 100755 index 2928c80b..00000000 --- a/interfaces/innerkits/samgr_proxy/include/system_ability_definition.h +++ /dev/null @@ -1,260 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef SAMGR_INTERFACES_INNERKITS_SAMGR_PROXY_INCLUDE_SYSTEM_ABILITY_DEFINITION_H -#define SAMGR_INTERFACES_INNERKITS_SAMGR_PROXY_INCLUDE_SYSTEM_ABILITY_DEFINITION_H - -#include -#include - -namespace OHOS { -// system ability definition should be a number between FIRST_SYS_ABILITY_ID and LAST_SYS_ABILITY_ID -enum { - FIRST_SYS_ABILITY_ID = 0x00000001, - SUBSYS_COMMON_SYS_ABILITY_ID_BEGIN = 1, - SUBSYS_AAFWK_SYS_ABILITY_ID_BEGIN = 100, - ABILITY_TOOLS_SERVICE_ID = 116, - ABILITY_TEST_SERVICE_ID = 179, - ABILITY_MGR_SERVICE_ID = 180, - ABILITY_MST_SERVICE_ID = 181, - DATAOBS_MGR_SERVICE_SA_ID = 182, - SUBSYS_AAFWK_SYS_ABILITY_ID_END = 199, - SUBSYS_ACCOUNT_SYS_ABILITY_ID_BEGIN = 200, - SUBSYS_AI_SYS_ABILITY_ID_BEGIN = 300, - SUBSYS_APPEXECFWK_SYS_ABILITY_ID_BEGIN = 400, - BUNDLE_MGR_SERVICE_SYS_ABILITY_ID = 401, - FORM_MGR_SERVICE_ID = 403, - SUBSYS_APPLICATIONS_SYS_ABILITY_ID_BEGIN = 500, - APP_MGR_SERVICE_ID = 501, - INSTALLD_SERVICE_ID = 511, - SUBSYS_ARVR_SYS_ABILITY_ID_BEGIN = 600, - SUBSYS_ARVRHARDWARE_SYS_ABILITY_ID_BEGIN = 700, - SUBSYS_BARRIERFREE_SYS_ABILITY_ID_BEGIN = 800, - SUBSYS_BIOMETRICS_SYS_ABILITY_ID_BEGIN = 900, - SUBSYS_BIOMETRICS_SYS_ABILITY_FACERECOGNIZE = 901, - SUBSYS_BIOMETRICS_SYS_ABILITY_FINGERPRINT = 902, - SUBSYS_BIOMETRICS_SYS_ABILITY_VOICEID = 903, - SUBSYS_CCRUNTIME_SYS_ABILITY_ID_BEGIN = 1000, - SUBSYS_COMMUNICATION_SYS_ABILITY_ID_BEGIN = 1100, - RPC_UNREGISTERED_TEST_SERVICE = 1108, - RPC_TEST_SERVICE = 1109, - RPC_TEST_SERVICE2 = 1110, - IPC_MSG_SEV = 1114, - IPC_MSG_UNREGISTERED_SERVER = 1115, - IPC_MSG_REPEAT_SERVER = 1116, - IPC_MSG_SERVER = 1117, - IPC_TEST_SERVICE = 1118, - IPC_EXTRA_TEST_SERVICE = 1119, - WIFI_DEVICE_SYS_ABILITY_ID = 1120, - WIFI_HOTSPOT_SYS_ABILITY_ID = 1121, - WIFI_ENHANCER_SYS_ABILITY_ID = 1122, - WIFI_P2P_SYS_ABILITY_ID = 1123, - BLUETOOTH_HOST_SYS_ABILITY_ID = 1130, - NFC_MANAGER_SYS_ABILITY_ID = 1140, - DISCOVER_SYS_ABILITY_ID = 1160, - DNET_SYS_ABILITY_ID = 1170, - NET_MANAGER_SYS_ABILITY_ID = 1150, - COMM_NET_CONN_MANAGER_SYS_ABILITY_ID = 1151, - COMM_NET_POLICY_MANAGER_SYS_ABILITY_ID = 1152, - COMM_NET_STATS_MANAGER_SYS_ABILITY_ID = 1153, - COMM_NET_TETHERING_MANAGER_SYS_ABILITY_ID = 1154, - COMM_VPN_MANAGER_SYS_ABILITY_ID = 1155, - COMM_DNS_MANAGER_SYS_ABILITY_ID = 1156, - COMM_ETHERNET_MANAGER_SYS_ABILITY_ID = 1157, - COMM_NETD_NATIVE_SYS_ABILITY_ID = 1158, - SMART_COMM_SYS_ABILITY_ID = 1180, - SUBSYS_DFX_SYS_ABILITY_ID_BEGIN = 1200, - DFX_SYS_HIVIEW_ABILITY_ID = 1201, - DFX_SYS_EVENT_SERVICE_ABILITY_ID = 1203, - SUBSYS_DISTRIBUTEDDATAMNG_SYS_ABILITY_ID_BEGIN = 1300, - DISTRIBUTED_KV_DATA_SERVICE_ABILITY_ID = 1301, - DISTRIBUTED_FS_DAEMON_SERVICE_ID = 1302, - DISTRIBUTED_FS_META_SERVICE_ID = 1303, - DISTRIBUTED_FS_STORAGE_SERVICE_ID = 1304, - SUBSYS_DISTRIBUTEDSCHEDULE_SYS_ABILITY_ID_BEGIN = 1400, - DISTRIBUTED_SCHED_SA_ID = 1401, - DISTRIBUTED_SCHED_ADAPTER_SA_ID = 1402, - DISTRIBUTED_SCENARIO_MGR_SA_ID = 1403, - DISTRIBUTED_SCHED_TEST_SO_ID = 1490, - DISTRIBUTED_SCHED_TEST_OS_ID = 1491, - DISTRIBUTED_SCHED_TEST_OOS_ID = 1492, - DISTRIBUTED_SCHED_TEST_TT_ID = 1493, - DISTRIBUTED_SCHED_TEST_LISTEN_ID = 1494, - DISTRIBUTED_SCHED_TEST_CONNECTION_ID = 1495, - DISTRIBUTED_SCHED_TEST_INCOMPLETE_ID = 1496, - DISTRIBUTED_SCHED_TEST_ONDEMAND_ID = 1497, - DISTRIBUTED_SCHED_TEST_AUDIO_ID = 1498, - DISTRIBUTED_SCHED_TEST_MEDIA_ID = 1499, - SUBSYS_DRIVERS_SYS_ABILITY_ID_BEGIN = 1500, - SUBSYS_GLOBAL_SYS_ABILITY_ID_BEGIN = 1600, - SUBSYS_GRAPHIC_SYS_ABILITY_ID_BEGIN = 1700, - SUBSYS_HBS_SYS_ABILITY_ID_BEGIN = 1800, - SUBSYS_IAWARE_SYS_ABILITY_ID_BEGIN = 1900, - RES_SCHED_SYS_ABILITY_ID = 1901, - RESSCHEDD_SA_ID = 1902, - BACKGROUND_TASK_MANAGER_SERVICE_ID = 1903, - WORK_SCHEDULE_SERVICE_ID = 1904, - SUBSYS_IDE_SYS_ABILITY_ID_BEGIN = 2000, - SUBSYS_INTELLIACCESSORIES_SYS_ABILITY_ID_BEGIN = 2100, - SUBSYS_INTELLISPEAKER_SYS_ABILITY_ID_BEGIN = 2200, - SUBSYS_INTELLITV_SYS_ABILITY_ID_BEGIN = 2300, - SUBSYS_IOT_SYS_ABILITY_ID_BEGIN = 2400, - SUBSYS_IOTHARDWARE_SYS_ABILITY_ID_BEGIN = 2500, - SUBSYS_IVIHARDWARE_SYS_ABILITY_ID_BEGIN = 2600, - IVIHARDWARE_MANAGER_SA_ID = 2601, - IVIHARDWARE_ADAS_SA_ID = 2602, - IVIHARDWARE_TBOX_SA_ID = 2603, - IVIHARDWARE_CLUSTER_SA_ID = 2604, - SUBSYS_KERNEL_SYS_ABILITY_ID_BEGIN = 2700, - SUBSYS_LOCATION_SYS_ABILITY_ID_BEGIN = 2800, - LOCATION_GEO_CONVERT_SA_ID = 2801, - LOCATION_LOCATOR_SA_ID = 2802, - LOCATION_GNSS_SA_ID = 2803, - LOCATION_NETWORK_LOCATING_SA_ID = 2804, - LOCATION_NOPOWER_LOCATING_SA_ID = 2805, - LOCATION_NOTIFICATION_SA_ID = 2806, - SUBSYS_MSDP_SYS_ABILITY_ID_BEGIN = 2900, - MSDP_MOTION_SERVICE_ID = 2901, - MSDP_DEVICESTATUS_SERVICE_ID = 2902, - MSDP_MOVEMENT_SERVICE_ID = 2903, - MSDP_SPATIAL_AWARENESS_SERVICE_ID = 2904, - MSDP_GEOFENCE_SERVICE_ID = 2905, - MSDP_TIMELINE_SERVICE_ID = 2906, - SUBSYS_MULTIMEDIA_SYS_ABILITY_ID_BEGIN = 3000, - AUDIO_DISTRIBUTED_SERVICE_ID = 3001, - PLAYER_DISTRIBUTED_SERVICE_ID = 3002, - RADIO_IVI_SERVICE_ID = 3003, - AUDIO_SWIFT_SERVICE_ID = 3004, - UPDATE_DISTRIBUTED_SERVICE_ID = 3006, - MEDIA_LIBRARY_SERVICE_ID = 3007, - CAMERA_SERVICE_ID = 3008, - AUDIO_POLICY_SERVICE_ID = 3009, - SUBSYS_MULTIMODAINPUT_SYS_ABILITY_ID_BEGIN = 3100, - MULTIMODAL_INPUT_SERVICE_ID = 3101, - MULTIMODAL_CHANNEL_SERVICE_ID = 3102, - SUBSYS_NOTIFICATION_SYS_ABILITY_ID_BEGIN = 3200, - EVENT_MANAGER_SERVICE_ID = 3201, - COMMON_EVENT_SERVICE_ABILITY_ID = 3202, - ADVANCED_NOTIFICATION_SERVICE_ABILITY_ID = 3203, - COMMON_EVENT_SERVICE_ID = 3299, - SUBSYS_POWERMNG_SYS_ABILITY_ID_BEGIN = 3300, - POWER_MANAGER_SERVICE_ID = 3301, - POWER_MANAGER_BATT_SERVICE_ID = 3302, - DISPLAY_MANAGER_SERVICE_ID = 3308, - IVIPOWER_ENHANCED_SERVICE_ID = 3309, - SUBSYS_ROUTER_SYS_ABILITY_ID_BEGIN = 3400, - SUBSYS_SECURITY_SYS_ABILITY_ID_BEGIN = 3500, - SUBSYS_SENSORS_SYS_ABILITY_ID_BEGIN = 3600, - SENSOR_SERVICE_ABILITY_ID = 3601, - MISCDEVICE_SERVICE_ABILITY_ID = 3602, - EXTSHB_SERVICE_ABILITY_ID = 3603, - SUBSYS_SMALLSERVICES_SYS_ABILITY_ID_BEGIN = 3700, - PASTEBOARD_SERVICE_ID = 3701, - TIME_SERVICE_ID = 3702, - INPUT_METHOD_SYSTEM_ABILITY_ID = 3703, - SUBSYS_SOURCECODETRANSFORMER_SYS_ABILITY_ID_BEGIN = 3800, - SUBSYS_STARTUP_SYS_ABILITY_ID_BEGIN = 3900, - PARAM_WATCHER_DISTRIBUTED_SERVICE_ID = 3901, - SUBSYS_TELEPONY_SYS_ABILITY_ID_BEGIN = 4000, - TELEPHONY_SYS_ABILITY_ID = 4001, - DCALL_SYS_ABILITY_ID = 4002, - TELEPHONY_CALL_MANAGER_SYS_ABILITY_ID = 4005, - TELEPHONY_CELLULAR_CALL_SYS_ABILITY_ID = 4006, - TELEPHONY_CELLULAR_DATA_SYS_ABILITY_ID = 4007, - TELEPHONY_SMS_MMS_SYS_ABILITY_ID = 4008, - TELEPHONY_STATE_REGISTRY_SYS_ABILITY_ID = 4009, - TELEPHONY_CORE_SERVICE_SYS_ABILITY_ID = 4010, - TELEPHONY_DATA_STORAGE_SYS_ABILITY_ID = 4012, - SUBSYS_UPDATE_SYS_ABILITY_ID_BEGIN = 4100, - SUBSYS_USB_SYS_ABILITY_ID_BEGIN = 4200, - USB_SYSTEM_ABILITY_ID = 4201, - SUBSYS_WEARABLE_SYS_ABILITY_ID_BEGIN = 4300, - SUBSYS_WEARABLEHARDWARE_SYS_ABILITY_ID_BEGIN = 4400, - SUBSYS_IVI_SYS_ABILITY_ID_BEGIN = 4500, - IVI_DRIVINGSAFETY_SA_ID = 4501, - IVI_CONFIGMANAGER_SA_ID = 4502, - IVI_COCKPITMONITOR_SA_ID = 4503, - WINDOW_MANAGER_ID = 4600, - VSYNC_MANAGER_ID = 4601, - VSYNC_MANAGER_TEST_ID = 4602, - GRAPHIC_DUMPER_SERVICE_SA_ID = 4603, - GRAPHIC_DUMPER_COMMAND_SA_ID = 4604, - ANIMATION_SERVER_SA_ID = 4605, - SOFTBUS_SERVER_SA_ID = 4700, - DEVICE_AUTH_SERVICE_ID = 4701, - SUBSYS_DISTRIBUTED_HARDWARE_SYS_ABILITY_ID_BEGIN = 4800, - DISTRIBUTED_HARDWARE_SA_ID = 4801, - DISTRIBUTED_HARDWARE_DEVICEMANAGER_SA_ID = 4802, - SUBSYS_STORAGE_SYS_ABILITY_ID_BEGIN = 4900, - STORAGE_DISTRIBUTED_FILE_DAEMON_SA_ID = 4901, - STORAGE_DISTRIBUTED_FILE_SERVICE_SA_ID = 4902, - DEVICE_STORAGE_MANAGER_SERVICE_ID = 5000, - STORAGE_SERVICE_ID = 5001, - DEVICE_SERVICE_MANAGER_SA_ID = 5100, - DISTRIBUTED_DEVICE_PROFILE_SA_ID = 6001, - LAST_SYS_ABILITY_ID = 0x00ffffff, // 16777215 -}; - -static const std::map saNameMap_ = { - { 200, "AccountMgr" }, - { 301, "AIEngine" }, - { BUNDLE_MGR_SERVICE_SYS_ABILITY_ID, "BundleMgr" }, - { FORM_MGR_SERVICE_ID, "FormMgr" }, - { WIFI_DEVICE_SYS_ABILITY_ID, "WifiDevice" }, - { WIFI_HOTSPOT_SYS_ABILITY_ID, "WifiHotspot" }, - { WIFI_ENHANCER_SYS_ABILITY_ID, "WifiEnhancer" }, - { WIFI_P2P_SYS_ABILITY_ID, "WifiP2p" }, - { BLUETOOTH_HOST_SYS_ABILITY_ID, "BluetoothHost" }, - { NFC_MANAGER_SYS_ABILITY_ID, "NfcManager" }, - { NET_MANAGER_SYS_ABILITY_ID, "NetManager" }, - { DISTRIBUTED_KV_DATA_SERVICE_ABILITY_ID, "DistributedKvData" }, - { DISTRIBUTED_SCHED_SA_ID, "DistributedSched" }, - { DISTRIBUTED_SCHED_ADAPTER_SA_ID, "DistributedSchedAdapter" }, - { DISTRIBUTED_SCENARIO_MGR_SA_ID, "DistributedScenarioMgr" }, - { RES_SCHED_SYS_ABILITY_ID, "ResourceSched" }, - { RESSCHEDD_SA_ID, "ResourceSchedDamon" }, - { BACKGROUND_TASK_MANAGER_SERVICE_ID, "BackgroundTaskManager" }, - { WORK_SCHEDULE_SERVICE_ID, "WorkSchedule" }, - { LOCATION_GEO_CONVERT_SA_ID, "LocationGeoConvert" }, - { LOCATION_LOCATOR_SA_ID, "LocationLocator" }, - { LOCATION_GNSS_SA_ID, "LocationGnss" }, - { LOCATION_NETWORK_LOCATING_SA_ID, "LocationNetworkLocating" }, - { LOCATION_NOPOWER_LOCATING_SA_ID, "LocationNopowerLocating" }, - { AUDIO_DISTRIBUTED_SERVICE_ID, "AudioDistributed" }, - { COMMON_EVENT_SERVICE_ABILITY_ID, "CommonEventService" }, - { ADVANCED_NOTIFICATION_SERVICE_ABILITY_ID, "AdvancedNotificationService" }, - { POWER_MANAGER_SERVICE_ID, "PowerManagerService" }, - { POWER_MANAGER_BATT_SERVICE_ID, "PowerManagerBatt" }, - { 3502, "DpmsService" }, - { 3510, "KeystoreService" }, - { SENSOR_SERVICE_ABILITY_ID, "SensorService" }, - { MISCDEVICE_SERVICE_ABILITY_ID, "MiscDeviceService" }, - { PASTEBOARD_SERVICE_ID, "DPasteboardService" }, - { TELEPHONY_SYS_ABILITY_ID, "Telephony" }, - { DCALL_SYS_ABILITY_ID, "DistributedCallMgr" }, - { DISTRIBUTED_HARDWARE_DEVICEMANAGER_SA_ID, "DeviceManagerService" }, - { USB_SYSTEM_ABILITY_ID, "UsbService" }, - { DEVICE_SERVICE_MANAGER_SA_ID, "HdfDeviceServiceManager" }, - { DISTRIBUTED_DEVICE_PROFILE_SA_ID, "DistributedDeviceProfile" }, - { WINDOW_MANAGER_ID, "WindowManager" }, - { VSYNC_MANAGER_ID, "VsyncManager" }, - { VSYNC_MANAGER_TEST_ID, "VsyncManagerTest" }, - { GRAPHIC_DUMPER_SERVICE_SA_ID, "GraphicDumperService" }, - { GRAPHIC_DUMPER_COMMAND_SA_ID, "GraphicDumperCommand" }, - { ANIMATION_SERVER_SA_ID, "AnimationServer" }, -}; -} // namespace OHOS - -#endif diff --git a/services/samgr/native/test/unittest/BUILD.gn b/services/samgr/native/test/unittest/BUILD.gn old mode 100644 new mode 100755 index c326589c..4333dc9c --- a/services/samgr/native/test/unittest/BUILD.gn +++ b/services/samgr/native/test/unittest/BUILD.gn @@ -19,7 +19,10 @@ samgr_services_dir = "${samgr_dir}/services/samgr/native" config("sam_test_config") { visibility = [ ":*" ] - include_dirs = [ "${samgr_services_dir}/test/unittest/include" ] + include_dirs = [ + "${samgr_services_dir}/test/unittest/include", + "//utils/system/safwk/native/include", + ] } ohos_unittest("SystemAbilityMgrTest") { -- Gitee