From 86b9df1f9874747a48586dd181319bcf82d7fe11 Mon Sep 17 00:00:00 2001
From: hellohyh001 <huiyuehong@huawei.com>
Date: Thu, 7 Apr 2022 14:55:33 +0800
Subject: [PATCH 1/3] modify kora warning

Signed-off-by: hellohyh001 <huiyuehong@huawei.com>
---
 .../native/sensor/src/sensor_data_channel.cpp | 30 +++----------------
 1 file changed, 4 insertions(+), 26 deletions(-)
 mode change 100755 => 100644 frameworks/native/sensor/src/sensor_data_channel.cpp

diff --git a/frameworks/native/sensor/src/sensor_data_channel.cpp b/frameworks/native/sensor/src/sensor_data_channel.cpp
old mode 100755
new mode 100644
index fc96e209..bfe97849
--- a/frameworks/native/sensor/src/sensor_data_channel.cpp
+++ b/frameworks/native/sensor/src/sensor_data_channel.cpp
@@ -35,12 +35,9 @@ namespace Sensors {
 using namespace OHOS::HiviewDFX;
 using namespace OHOS::AppExecFwk;
 std::shared_ptr<MyEventHandler> SensorDataChannel::eventHandler_;
-std::shared_ptr<AppExecFwk::EventRunner> SensorDataChannel::eventRunner_;
 
 namespace {
 constexpr HiLogLabel LABEL = { LOG_CORE, SensorsLogDomain::SENSOR_NATIVE, "SensorDataChannel" };
-// max 100 data in cache buffer
-constexpr uint32_t STOP_EVENT_ID = 0;
 }  // namespace
 
 int32_t SensorDataChannel::CreateSensorDataChannel(DataChannelCB callBack, void *data)
@@ -74,41 +71,22 @@ int32_t SensorDataChannel::InnerSensorDataChannel()
     listener->SetChannel(this);
     auto myRunner = AppExecFwk::EventRunner::Create(true);
     CHKPR(myRunner, ERROR);
-    auto handler = std::make_shared<MyEventHandler>(myRunner);
-    CHKPR(handler, ERROR);
+    eventHandler_ = std::make_shared<MyEventHandler>(myRunner);
+    CHKPR(eventHandler_, ERROR);
     int32_t receiveFd = GetReceiveDataFd();
-    auto inResult = handler->AddFileDescriptorListener(receiveFd, AppExecFwk::FILE_DESCRIPTOR_INPUT_EVENT, listener);
+    auto inResult = eventHandler_->AddFileDescriptorListener(receiveFd, AppExecFwk::FILE_DESCRIPTOR_INPUT_EVENT, listener);
     if (inResult != 0) {
         SEN_HILOGE("AddFileDescriptorListener fail");
         return ERROR;
     }
-    eventHandler_ = handler;
-    eventRunner_ = myRunner;
-    int64_t delayTime = 100;
-    int64_t param = 0;
-    bool sendEventResult = eventHandler_->SendEvent(STOP_EVENT_ID, param, delayTime);
-    if (!sendEventResult) {
-        SEN_HILOGE("EventHandler SendEvent fail");
-        return ERROR;
-    }
-    int32_t runResult = eventRunner_->Run();
-    if (!runResult) {
-        SEN_HILOGE("EventRunner run fail");
-        return ERROR;
-    }
     return ERR_OK;
 }
 
 int32_t SensorDataChannel::DestroySensorDataChannel()
 {
     std::lock_guard<std::mutex> eventRunnerLock(eventRunnerMutex_);
-    CHKPR(eventHandler_, ERROR);
-    CHKPR(eventRunner_, ERROR);
-    int32_t receiveFd = GetReceiveDataFd();
-    eventHandler_->RemoveFileDescriptorListener(receiveFd);
+    CHKPL(eventHandler_);
     eventHandler_ = nullptr;
-    eventRunner_->Stop();
-    eventRunner_ = nullptr;
     // destroy sensor basic channelx
     return DestroySensorBasicChannel();
 }
-- 
Gitee


From efdd080a58cdcf28a86bc2bea96200f5e7ace56d Mon Sep 17 00:00:00 2001
From: hellohyh001 <huiyuehong@huawei.com>
Date: Thu, 7 Apr 2022 15:27:10 +0800
Subject: [PATCH 2/3] modify kora warning

Signed-off-by: hellohyh001 <huiyuehong@huawei.com>
---
 frameworks/native/sensor/src/sensor_data_channel.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frameworks/native/sensor/src/sensor_data_channel.cpp b/frameworks/native/sensor/src/sensor_data_channel.cpp
index bfe97849..371d8869 100644
--- a/frameworks/native/sensor/src/sensor_data_channel.cpp
+++ b/frameworks/native/sensor/src/sensor_data_channel.cpp
@@ -74,7 +74,8 @@ int32_t SensorDataChannel::InnerSensorDataChannel()
     eventHandler_ = std::make_shared<MyEventHandler>(myRunner);
     CHKPR(eventHandler_, ERROR);
     int32_t receiveFd = GetReceiveDataFd();
-    auto inResult = eventHandler_->AddFileDescriptorListener(receiveFd, AppExecFwk::FILE_DESCRIPTOR_INPUT_EVENT, listener);
+    auto inResult = eventHandler_->AddFileDescriptorListener(receiveFd,
+        AppExecFwk::FILE_DESCRIPTOR_INPUT_EVENT, listener);
     if (inResult != 0) {
         SEN_HILOGE("AddFileDescriptorListener fail");
         return ERROR;
-- 
Gitee


From 9c47734ee929156cd578a0e35345bc2a738017d9 Mon Sep 17 00:00:00 2001
From: hellohyh001 <huiyuehong@huawei.com>
Date: Thu, 7 Apr 2022 16:35:33 +0800
Subject: [PATCH 3/3] modify kora warning

Signed-off-by: hellohyh001 <huiyuehong@huawei.com>
---
 interfaces/native/src/geomagnetic_field.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/interfaces/native/src/geomagnetic_field.cpp b/interfaces/native/src/geomagnetic_field.cpp
index 7b2de3b1..254abf35 100644
--- a/interfaces/native/src/geomagnetic_field.cpp
+++ b/interfaces/native/src/geomagnetic_field.cpp
@@ -285,13 +285,11 @@ float GeomagneticField::ObtainGeomagneticDip()
 
 double GeomagneticField::ToDegrees(double angrad)
 {
-    std::lock_guard<std::mutex> geomagneticLock(mutex_);
     return angrad * 180.0 / M_PI;
 }
 
 double GeomagneticField::ToRadians(double angdeg)
 {
-    std::lock_guard<std::mutex> geomagneticLock(mutex_);
     return angdeg / 180.0 * M_PI;
 }
 
-- 
Gitee