From 502e4e708d11eab3cd396b46b7f209616b7b7d7c Mon Sep 17 00:00:00 2001
From: ql <qianli16@huawei.com>
Date: Mon, 26 Jul 2021 08:08:09 +0000
Subject: [PATCH 1/3] update services/samgr/native/source/sa_main.cpp.
 Signed-off-by: NEEN <qianli16@huawei.com>

---
 services/samgr/native/source/sa_main.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/services/samgr/native/source/sa_main.cpp b/services/samgr/native/source/sa_main.cpp
index 9811be2c..242a8418 100755
--- a/services/samgr/native/source/sa_main.cpp
+++ b/services/samgr/native/source/sa_main.cpp
@@ -13,15 +13,30 @@
  * limitations under the License.
  */
 
+#include <thread>
+#include <unistd.h>
+
 #include "errors.h"
 #include "ipc_skeleton.h"
 #include "ipc_types.h"
 #include "iservice_registry.h"
 #include "sam_log.h"
 #include "system_ability_manager.h"
-
+ 
 using namespace OHOS;
 
+void startDBinderService(OHOS::sptr<OHOS::SystemAbilityManager> manager) {
+    int time = 30;
+    while (time-- > 0) {
+        sleep(1);
+    }
+    auto dBinder = manager->GetDBinder();
+    if (dBinder != nullptr) {
+        bool ret = dBinder->StartDBinderService();
+        HILOGI("started dbinder service result is %{public}s", ret ? "ok" : "fail");
+    }
+}
+
 int main(int argc, char *argv[])
 {
     HILOGI("%{public}s called, enter System Ability Manager ", __func__);
@@ -31,9 +46,11 @@ int main(int argc, char *argv[])
     // Tell IPCThreadState we're the service manager
     OHOS::sptr<OHOS::IRemoteObject> serv = manager->AsObject();
     IPCSkeleton::SetContextObject(serv);
+    std::thread th(startDBinderService, manager);
+    th.detach();
 
     // Create IPCThreadPool and join in.
     HILOGI("start System Ability Manager Loop");
     OHOS::IPCSkeleton::JoinWorkThread();
     return -1;
-}
+}
\ No newline at end of file
-- 
Gitee


From 9fa12ae4fb2e22787226b7b6a4cb9164bb32d607 Mon Sep 17 00:00:00 2001
From: ql <qianli16@huawei.com>
Date: Mon, 26 Jul 2021 08:12:59 +0000
Subject: [PATCH 2/3] update services/samgr/native/source/sa_main.cpp.
 Signed-off-by: NEEN <qianli16@huawei.com>

---
 services/samgr/native/source/sa_main.cpp | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/services/samgr/native/source/sa_main.cpp b/services/samgr/native/source/sa_main.cpp
index 242a8418..9811be2c 100755
--- a/services/samgr/native/source/sa_main.cpp
+++ b/services/samgr/native/source/sa_main.cpp
@@ -13,29 +13,14 @@
  * limitations under the License.
  */
 
-#include <thread>
-#include <unistd.h>
-
 #include "errors.h"
 #include "ipc_skeleton.h"
 #include "ipc_types.h"
 #include "iservice_registry.h"
 #include "sam_log.h"
 #include "system_ability_manager.h"
- 
-using namespace OHOS;
 
-void startDBinderService(OHOS::sptr<OHOS::SystemAbilityManager> manager) {
-    int time = 30;
-    while (time-- > 0) {
-        sleep(1);
-    }
-    auto dBinder = manager->GetDBinder();
-    if (dBinder != nullptr) {
-        bool ret = dBinder->StartDBinderService();
-        HILOGI("started dbinder service result is %{public}s", ret ? "ok" : "fail");
-    }
-}
+using namespace OHOS;
 
 int main(int argc, char *argv[])
 {
@@ -46,11 +31,9 @@ int main(int argc, char *argv[])
     // Tell IPCThreadState we're the service manager
     OHOS::sptr<OHOS::IRemoteObject> serv = manager->AsObject();
     IPCSkeleton::SetContextObject(serv);
-    std::thread th(startDBinderService, manager);
-    th.detach();
 
     // Create IPCThreadPool and join in.
     HILOGI("start System Ability Manager Loop");
     OHOS::IPCSkeleton::JoinWorkThread();
     return -1;
-}
\ No newline at end of file
+}
-- 
Gitee


From 30c9194f8f52297baf56a169d7cd9ec29ba0ef3b Mon Sep 17 00:00:00 2001
From: ql <qianli16@huawei.com>
Date: Mon, 9 Aug 2021 10:17:37 +0000
Subject: [PATCH 3/3] add OAT.xml. Signed-off-by: NEEN <qianli16@huawei.com>

---
 OAT.xml  | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 OAT.xml 

diff --git a/OAT.xml  b/OAT.xml 
new file mode 100644
index 00000000..9b3e485a
--- /dev/null
+++ b/OAT.xml 	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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.
+-->
+<!-- OAT(OSS Audit Tool) configuration guide:
+basedir: Root dir, the basedir + project path is the real source file location.
+licensefile:
+1.If the project don't have "LICENSE" in root dir, please define all the license files in this project in , OAT will check license files according to this rule.
+
+tasklist(only for batch mode):
+1. task: Define oat check thread, each task will start a new thread.
+2. task name: Only an name, no practical effect.
+3. task policy: Default policy for projects under this task, this field is required and the specified policy must defined in policylist.
+4. task filter: Default filefilter for projects under this task, this field is required and the specified filefilter must defined in filefilterlist.
+5. task project: Projects to be checked, the path field define the source root dir of the project.
+
+
+policyList:
+1. policy: All policyitems will be merged to default OAT.xml rules, the name of policy doesn't affect OAT check process.
+2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is:
+<policyitem type="" name="" path="" desc="" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter"/>
+3. policyitem type:
+    "compatibility" is used to check license compatibility in the specified path;
+    "license" is used to check source license header in the specified path;
+    "copyright" is used to check source copyright header in the specified path;
+    "import" is used to check source dependency in the specified path, such as import ... ,include ...
+    "filetype" is used to check file type in the specified path, supported file types: archive, binary
+    "filename" is used to check whether the specified file exists in the specified path(support projectroot in default OAT.xml), supported file names: LICENSE, README, README.OpenSource
+
+4. policyitem name: This field is used for define the license, copyright, "*" means match all, the "!" prefix means could not match this value. For example, "!GPL" means can not use GPL license.
+5. policyitem path: This field is used for define the source file scope to apply this policyitem, the "!" prefix means exclude the files. For example, "!.*/lib/.*" means files in lib dir will be exclude while process this policyitem.
+6. policyitem rule and group: These two fields are used together to merge policy results. "may" policyitems in the same group means any one in this group passed, the result will be passed.
+7. policyitem filefilter: Used to bind filefilter which define filter rules.
+8. filefilter: Filter rules, the type filename is used to filter file name, the type filepath is used to filter file path.
+
+Note:If the text contains special characters, please escape them according to the following rules:
+" == &gt;
+& == &gt;
+' == &gt;
+< == &gt;
+> == &gt;
+-->
+<configuration>
+    <oatconfig>
+        <licensefile></licensefile>
+        <filefilterlist>
+            <filefilter name="copyrightPolicyFilter" desc="copyright文件头校验策略的过滤条件" >
+                <filteritem type="filepath" name="services/samgr/native/samgr_L2.cfg" desc="cfg文件为json格式,无法添加版权头"/>
+            </filefilter>
+        </filefilterlist>
+    </oatconfig>
+</configuration>
\ No newline at end of file
-- 
Gitee