From decb0f48a6e4aec7713bb486259f59ae7f6f3e18 Mon Sep 17 00:00:00 2001
From: wangdantong <wangdantong@huawei.com>
Date: Mon, 22 May 2023 07:26:10 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9xml=E4=B8=BAjson=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdantong <wangdantong@huawei.com>
Change-Id: Ib90c90a5a74eb5557831ec8b7d6f02de097edb01
---
 init/device_usage_statistics_service.cfg   |  2 +-
 sa_profile/1907.xml                        | 26 ----------------------
 sa_profile/BUILD.gn                        |  2 +-
 sa_profile/device_usage_stats_service.json | 13 +++++++++++
 4 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 sa_profile/1907.xml
 create mode 100644 sa_profile/device_usage_stats_service.json

diff --git a/init/device_usage_statistics_service.cfg b/init/device_usage_statistics_service.cfg
index fe22484..ea0e0cb 100644
--- a/init/device_usage_statistics_service.cfg
+++ b/init/device_usage_statistics_service.cfg
@@ -9,7 +9,7 @@
     ],
     "services" : [{
             "name" : "device_usage_stats_service",
-            "path" : ["/system/bin/sa_main", "/system/profile/device_usage_stats_service.xml"],
+            "path" : ["/system/bin/sa_main", "/system/profile/device_usage_stats_service.json"],
             "uid" : "device_usage_stats",
             "gid" : ["device_usage_stats", "shell"],
             "secon" : "u:r:device_usage_stats_service:s0",
diff --git a/sa_profile/1907.xml b/sa_profile/1907.xml
deleted file mode 100644
index 579133c..0000000
--- a/sa_profile/1907.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2022 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.
- -->
-<info>
-    <process>device_usage_stats_service</process>
-    <systemability>
-        <name>1907</name>
-        <libpath>libusagestatservice.z.so</libpath>
-        <depend-time-out>60000</depend-time-out>
-        <run-on-create>true</run-on-create>
-        <distributed>false</distributed>
-        <dump-level>1</dump-level>
-    </systemability>
-</info>
\ No newline at end of file
diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn
index 8ec614f..1f97280 100644
--- a/sa_profile/BUILD.gn
+++ b/sa_profile/BUILD.gn
@@ -22,6 +22,6 @@ ohos_prebuilt_etc("device_usage_statistics_service_init") {
 }
 
 ohos_sa_profile("usagestat_sa_profile") {
-  sources = [ "1907.xml" ]
+  sources = [ "device_usage_stats_service.json" ]
   part_name = "device_usage_statistics"
 }
diff --git a/sa_profile/device_usage_stats_service.json b/sa_profile/device_usage_stats_service.json
new file mode 100644
index 0000000..429f922
--- /dev/null
+++ b/sa_profile/device_usage_stats_service.json
@@ -0,0 +1,13 @@
+{
+    "process": "device_usage_stats_service",
+    "systemability": [
+        {
+            "name": 1907,
+            "libpath": "libusagestatservice.z.so",
+            "run-on-create": true,
+            "depend_time_out": 60000,
+            "distributed": false,
+            "dump_level": 1
+        }
+    ]
+}
\ No newline at end of file
-- 
Gitee