From a40bc188894fc39baa3ce92a003ddab1c95c2b4e Mon Sep 17 00:00:00 2001
From: h00514358 <huiyuehong@huawei.com>
Date: Tue, 14 Sep 2021 07:30:53 +0000
Subject: [PATCH 1/2] Signed-off-by:hellohyh001<huiyuehong@huawei.com>

Signed-off-by: h00514358 <huiyuehong@huawei.com>
---
 frameworks/src/sensor_agent_proxy.c | 67 ++++++++++++++---------------
 services/src/sensor_service.c       | 33 +++++++-------
 2 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/frameworks/src/sensor_agent_proxy.c b/frameworks/src/sensor_agent_proxy.c
index dd88474..a04b8de 100755
--- a/frameworks/src/sensor_agent_proxy.c
+++ b/frameworks/src/sensor_agent_proxy.c
@@ -234,42 +234,41 @@ int32_t SensorChannelCallback(const IpcContext *context, void *ipcMsg, IpcIo *io
 int32_t RegisterSensorChannel(const void *proxy, int32_t sensorId)
 {
     HILOG_DEBUG(HILOG_MODULE_APP, "%s begin", __func__);
-    if (!IsRegisterCallback()) {
-        int32_t ret = RegisterIpcCallback(SensorChannelCallback, 0, IPC_WAIT_FOREVER, &g_svcIdentity, NULL);
-        if (ret != LITEIPC_OK) {
-            HILOG_ERROR(HILOG_MODULE_APP, "%s failed, ret: %d", __func__, ret);
-            return SENSOR_ERROR_INVALID_PARAM;
-        }
-        IpcIo request;
-        char data[IPC_IO_DATA_MAX];
-        IpcIoInit(&request, data, IPC_IO_DATA_MAX, IPC_MAX_OBJECTS);
-        IpcIoPushInt32(&request, sensorId);
-        IpcIoPushSvc(&request, &g_svcIdentity);
-        if (!IpcIoAvailable(&request)) {
-            HILOG_ERROR(HILOG_MODULE_APP, "%s ipc communication failed", __func__);
-            return SENSOR_ERROR_INVALID_PARAM;
-        }
-        IClientProxy *client = (IClientProxy *)proxy;
-        if (client == NULL) {
-            HILOG_ERROR(HILOG_MODULE_APP, "%s client is null", __func__);
+    if (IsRegisterCallback()) {
+        HILOG_DEBUG(HILOG_MODULE_APP, "%s sensorChannel has been registered ", __func__);
+        return SENSOR_OK;
+    }
+    int32_t ret = RegisterIpcCallback(SensorChannelCallback, 0, IPC_WAIT_FOREVER, &g_svcIdentity, NULL);
+    if (ret != LITEIPC_OK) {
+        HILOG_ERROR(HILOG_MODULE_APP, "%s failed, ret: %d", __func__, ret);
+        return SENSOR_ERROR_INVALID_PARAM;
+    }
+    IpcIo request;
+    char data[IPC_IO_DATA_MAX];
+    IpcIoInit(&request, data, IPC_IO_DATA_MAX, IPC_MAX_OBJECTS);
+    IpcIoPushInt32(&request, sensorId);
+    IpcIoPushSvc(&request, &g_svcIdentity);
+    if (!IpcIoAvailable(&request)) {
+        HILOG_ERROR(HILOG_MODULE_APP, "%s ipc communication failed", __func__);
+        return SENSOR_ERROR_INVALID_PARAM;
+    }
+    IClientProxy *client = (IClientProxy *)proxy;
+    if (client == NULL) {
+        HILOG_ERROR(HILOG_MODULE_APP, "%s client is null", __func__);
+        return SENSOR_ERROR_INVALID_PARAM;
+    }
+    int32_t retCode = -1;
+    ret = client->Invoke(client, SENSOR_SERVICE_ID_SubscribeSensor, &request, &retCode, Notify);
+    if ((ret != LITEIPC_OK) || (retCode != SENSOR_OK)) {
+        HILOG_ERROR(HILOG_MODULE_APP, "%s failed, ret: %d, retCode: %d", __func__, ret, retCode);
+        return SENSOR_ERROR_INVALID_PARAM;
+    }
+    if (g_sensorEvent == NULL) {
+        g_sensorEvent = (SensorEvent *)malloc(sizeof(SensorEvent));
+        if (g_sensorEvent == NULL) {
+            HILOG_ERROR(HILOG_MODULE_APP, "%s malloc failed", __func__);
             return SENSOR_ERROR_INVALID_PARAM;
-        } else {
-            int32_t retCode = -1;
-            ret = client->Invoke(client, SENSOR_SERVICE_ID_SubscribeSensor, &request, &retCode, Notify);
-            if ((ret != LITEIPC_OK) || (retCode != SENSOR_OK)) {
-                HILOG_ERROR(HILOG_MODULE_APP, "%s failed, ret: %d, retCode: %d", __func__, ret, retCode);
-                return SENSOR_ERROR_INVALID_PARAM;
-            }
-            if (g_sensorEvent == NULL) {
-                g_sensorEvent = (SensorEvent *)malloc(sizeof(SensorEvent));
-                if (g_sensorEvent == NULL) {
-                    HILOG_ERROR(HILOG_MODULE_APP, "%s malloc failed", __func__);
-                    return SENSOR_ERROR_INVALID_PARAM;
-                }
-            }
         }
-    } else {
-        HILOG_DEBUG(HILOG_MODULE_APP, "%s sensorChannel has been registered ", __func__);
     }
     return SENSOR_OK;
 }
diff --git a/services/src/sensor_service.c b/services/src/sensor_service.c
index f7bbb9d..10dff13 100755
--- a/services/src/sensor_service.c
+++ b/services/src/sensor_service.c
@@ -29,24 +29,23 @@ int32_t GetAllSensorsInvoke(SensorFeatureApi *defaultApi, IpcIo *req, IpcIo *rep
         HILOG_ERROR(HILOG_MODULE_APP, "[SERVICE:%s]: %s failed, defaultApi is null", SENSOR_SERVICE, __func__);
         IpcIoPushInt32(reply, SENSOR_ERROR_UNKNOWN);
         return SENSOR_ERROR_UNKNOWN;
-    } else{
-        SensorInfo *sensorInfo = NULL;
-        int32_t count = 0;
-        int32_t ret = defaultApi->GetAllSensors(&sensorInfo, &count);
-        if (ret != SENSOR_OK) {
-            HILOG_ERROR(HILOG_MODULE_APP, "[SERVICE:%s]: %s failed, ret: %d", SENSOR_SERVICE, __func__, ret);
-            IpcIoPushInt32(reply, ret);
-            return ret;
-        }
-        BuffPtr dataBuff = {
-            .buffSz = (uint32_t)(count * sizeof(SensorInfo)),
-            .buff = sensorInfo
-        };
-        IpcIoPushInt32(reply, SENSOR_OK);
-        IpcIoPushInt32(reply, count);
-        IpcIoPushDataBuff(reply, &dataBuff);
-        return SENSOR_OK;
     }
+    SensorInfo *sensorInfo = NULL;
+    int32_t count = 0;
+    int32_t ret = defaultApi->GetAllSensors(&sensorInfo, &count);
+    if (ret != SENSOR_OK) {
+        HILOG_ERROR(HILOG_MODULE_APP, "[SERVICE:%s]: %s failed, ret: %d", SENSOR_SERVICE, __func__, ret);
+        IpcIoPushInt32(reply, ret);
+        return ret;
+    }
+    BuffPtr dataBuff = {
+        .buffSz = (uint32_t)(count * sizeof(SensorInfo)),
+        .buff = sensorInfo
+    };
+    IpcIoPushInt32(reply, SENSOR_OK);
+    IpcIoPushInt32(reply, count);
+    IpcIoPushDataBuff(reply, &dataBuff);
+    return SENSOR_OK;
 }
 
 int32_t ActivateSensorInvoke(SensorFeatureApi *defaultApi, IpcIo *req, IpcIo *reply)
-- 
Gitee


From eac9d43f4bc8adaa65f538764c30212ecd84186f Mon Sep 17 00:00:00 2001
From: SUE <huiyuehong@huawei.com>
Date: Mon, 27 Sep 2021 07:19:23 +0000
Subject: [PATCH 2/2] git commit -sm
 "Signed-off-by:hellohyh001<huiyuehong@huawei.com>"

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

diff --git a/OAT.xml b/OAT.xml
new file mode 100644
index 0000000..03b9e20
--- /dev/null
+++ b/OAT.xml
@@ -0,0 +1,68 @@
+<?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>
+        <policylist>
+            <policy name="projectPolicy" desc="">
+            </policy>
+        </policylist>
+        <filefilterlist>
+            <filefilter name="defaultFilter" desc="Files not to check">
+                <filteritem type="filename" name="*.png|*.rpk" desc="valid and invalid bundle files for tests"/>
+            </filefilter>
+        </filefilterlist>
+    </oatconfig>
+</configuration>
\ No newline at end of file
-- 
Gitee