update code

Change-Id: I455362cc82813b9aa997f64f8b41ac95603e248c
Signed-off-by: Tianshi Liu <tianshi.liu@huawei.com>

sa_profile/face_auth_service.cfg

@@ -2,9 +2,8 @@
     "services" : [{
             "name" : "face_service",
             "path" : ["/system/bin/sa_main", "/system/profile/face_service.xml"],
-            "importance" : -20,
             "uid" : "system",
-            "gid" : ["system"],
+            "gid" : ["system", "shell"],
             "secon" : "u:r:face_service:s0"
         }
     ]

services/faceauth/src/face_auth_manager.cpp

@@ -47,7 +47,7 @@ std::shared_ptr<FaceAuthManager> FaceAuthManager::GetInstance()
 
 void CheckSystemAbility()
 {
-    const int CHECK_TIMES = 3;
+    const int CHECK_TIMES = 20;
     const int SLEEP_TIME = 1;
     sptr<ISystemAbilityManager> sam = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
     if (sam == nullptr) {
@@ -384,24 +384,20 @@ FIRetCode FaceAuthManager::OperForAlgorithm(uint64_t scheduleID)
         FACEAUTH_HILOGI(MODULE_SERVICE, "faceAuthCA is null.");
         return FI_RC_INVALID_ARGUMENT;
     }
-    int32_t retCode = 0;
-    std::vector<uint8_t> retCoauthMsg;
-    std::vector<uint8_t> m_msg;
-    std::shared_ptr<AuthResPool::AuthMessage> msgInstance = std::make_shared<AuthResPool::AuthMessage>(m_msg);
-    if (msgInstance == nullptr) {
-        return FI_RC_INVALID_ARGUMENT;
-    }
+
     while (1) {
-        faceAuthCA->GetAlgorithmState(retCode, retCoauthMsg);
-        FACEAUTH_HILOGI(MODULE_SERVICE, "receive new co auth message.");
-        std::shared_ptr<AuthResPool::AuthMessage> msg(msgInstance->FromUint8Array(retCoauthMsg));
-        if (msg != nullptr) {
-            SendData(scheduleID, 0, TYPE_ALL_IN_ONE, TYPE_CO_AUTH, msg);
-        }
+        int32_t retCode = 0;
+        std::vector<uint8_t> retCoAuthMsg;
+        faceAuthCA->GetAlgorithmState(retCode, retCoAuthMsg);
         if (FACE_ALOGRITHM_OPERATION_BREAK == retCode) {
             FACEAUTH_HILOGI(MODULE_SERVICE, "FACE_ALOGRITHM_OPERATION_BREAK.");
             break;
         }
+        FACEAUTH_HILOGI(MODULE_SERVICE, "receive new co auth message.");
+        std::shared_ptr<AuthResPool::AuthMessage> msg = std::make_shared<AuthResPool::AuthMessage>(retCoAuthMsg);
+        if (msg != nullptr) {
+            SendData(scheduleID, 0, TYPE_ALL_IN_ONE, TYPE_CO_AUTH, msg);
+        }
     }
     HandleAlgoResult(scheduleID);
     return FI_RC_OK;
@@ -502,6 +498,7 @@ void FaceAuthManager::Finish(uint64_t scheduleId,
 {
     if (executorMessenger_ != nullptr) {
         executorMessenger_->Finish(scheduleId, srcType, resultCode, finalResult);
+        FACEAUTH_HILOGI(MODULE_SERVICE, "executorMessenger_ finish called.");
     } else {
         FACEAUTH_HILOGI(MODULE_SERVICE, "executorMessenger_ is null.");
     }

services/temp/include/buffer.h

@@ -34,7 +34,6 @@ ResultCode InitBuffer(Buffer *buffer, const uint8_t *buf, const uint32_t bufSize
 void DestoryBuffer(Buffer *buffer);
 Buffer *CopyBuffer(const Buffer *buffer);
 bool CompareBuffer(const Buffer *buffer1, const Buffer *buffer2);
-Buffer *CreateBufferByData(const uint8_t *data, const uint32_t dataSize);
 ResultCode GetBufferData(const Buffer *buffer, uint8_t *data, uint32_t *dataSize);
 bool CheckBufferWithSize(const Buffer *buffer, const uint32_t size);
 } // namespace FaceAuth

services/temp/src/buffer.cpp

@@ -48,7 +48,7 @@ Buffer *CreateBuffer(const uint32_t size)
         return nullptr;
     }
 
-    Buffer *buffer = new Buffer;
+    Buffer *buffer = (Buffer *)malloc(sizeof(Buffer));
     if (buffer == nullptr) {
         FACEAUTH_HILOGE(MODULE_SERVICE, "Get buffer struct error");
         return nullptr;
@@ -57,13 +57,13 @@ Buffer *CreateBuffer(const uint32_t size)
     buffer->buf = (uint8_t *)malloc(size);
     if (buffer->buf == nullptr) {
         FACEAUTH_HILOGE(MODULE_SERVICE, "Get buffer error");
-        delete buffer;
+        free(buffer);
         return nullptr;
     }
 
     if (memset_s(buffer->buf, size, 0, size) != EOK) {
-        delete buffer->buf;
-        delete buffer;
+        free(buffer->buf);
+        free(buffer);
         return nullptr;
     }
     buffer->maxSize = size;
@@ -72,37 +72,6 @@ Buffer *CreateBuffer(const uint32_t size)
     return buffer;
 }
 
-Buffer *CreateBufferByData(const uint8_t *data, const uint32_t dataSize)
-{
-    if ((data == nullptr) || (dataSize == 0) || (dataSize > MAX_BUFFER_SIZE)) {
-        FACEAUTH_HILOGE(MODULE_SERVICE, "Bad param size:%u", dataSize);
-        return nullptr;
-    }
-
-    Buffer *buffer = new Buffer;
-    if (buffer == nullptr) {
-        FACEAUTH_HILOGE(MODULE_SERVICE, "Get buffer struct error");
-        return nullptr;
-    }
-
-    buffer->buf = new uint8_t;
-    if (buffer->buf == nullptr) {
-        FACEAUTH_HILOGE(MODULE_SERVICE, "Get buffer error");
-        delete buffer;
-        return nullptr;
-    }
-
-    if (memcpy_s(buffer->buf, dataSize, data, dataSize) != EOK) {
-        FACEAUTH_HILOGE(MODULE_SERVICE, "Cpy buffer error");
-        DestoryBuffer(buffer);
-        return nullptr;
-    }
-    buffer->maxSize = dataSize;
-    buffer->contentSize = dataSize;
-
-    return buffer;
-}
-
 ResultCode InitBuffer(Buffer *buffer, const uint8_t *buf, const uint32_t bufSize)
 {
     if (!IsBufferValid(buffer) || (buf == nullptr) || (bufSize == 0)) {
@@ -126,12 +95,12 @@ void DestoryBuffer(Buffer *buffer)
             if (memset_s(buffer->buf, buffer->contentSize, 0, buffer->contentSize) != EOK) {
                 FACEAUTH_HILOGE(MODULE_SERVICE, "DestoryBuffer memset fail!");
             }
-            delete buffer->buf;
+            free(buffer->buf);
             buffer->buf = nullptr;
             buffer->contentSize = 0;
             buffer->maxSize = 0;
         }
-        delete buffer;
+        free(buffer);
     }
 }