From 0dadc4db31ba1e0f2b88aeceab08df277d3af751 Mon Sep 17 00:00:00 2001
From: rwx1283129 <renxinyao2@huawei.com>
Date: Wed, 1 Nov 2023 03:55:32 +0000
Subject: [PATCH 1/2] Initial quarantine in macro mode

Signed-off-by: rwx1283129 <renxinyao2@huawei.com>
---
 sensor.gni                                    |  8 ++++++++
 services/BUILD.gn                             | 14 ++++++++++++--
 .../adapter/src/compatible_connection.cpp     |  2 ++
 .../interface/src/sensor_hdi_connection.cpp   | 19 +++++++++++++------
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/sensor.gni b/sensor.gni
index 4bf58c1e..fcb8420b 100644
--- a/sensor.gni
+++ b/sensor.gni
@@ -34,3 +34,11 @@ if (!defined(global_parts_info) ||
 } else {
   hdf_drivers_interface_sensor = false
 }
+
+if(build_variant == "eng) {
+  sensor_default_defines += [ "BUILD_VARIANT_ENG" ]
+  sensor_build_eng = true;  
+}
+else {
+  sensor_build_eng = false;
+}
\ No newline at end of file
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 6513d2d9..2d4a8821 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -59,7 +59,6 @@ ohos_shared_library("libsensor_service") {
 
   if (hdf_drivers_interface_sensor) {
     sources += [
-      "hdi_connection/adapter/src/compatible_connection.cpp",
       "hdi_connection/adapter/src/hdi_connection.cpp",
       "hdi_connection/adapter/src/sensor_event_callback.cpp",
       "hdi_connection/hardware/src/hdi_service_impl.cpp",
@@ -73,6 +72,12 @@ ohos_shared_library("libsensor_service") {
       "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include",
     ]
 
+    if(sensor_build_eng) {
+      sources += [
+        "hdi_connection/adapter/src/compatible_connection.cpp",
+      ]
+    }
+
     external_deps += [ "drivers_interface_sensor:libsensor_proxy_1.1" ]
   }
 
@@ -127,7 +132,6 @@ ohos_shared_library("libsensor_service_static") {
 
   if (hdf_drivers_interface_sensor) {
     sources += [
-      "hdi_connection/adapter/src/compatible_connection.cpp",
       "hdi_connection/adapter/src/hdi_connection.cpp",
       "hdi_connection/adapter/src/sensor_event_callback.cpp",
       "hdi_connection/hardware/src/hdi_service_impl.cpp",
@@ -140,6 +144,12 @@ ohos_shared_library("libsensor_service_static") {
       "$SUBSYSTEM_DIR/services/hdi_connection/adapter/include",
       "$SUBSYSTEM_DIR/services/hdi_connection/hardware/include",
     ]
+    
+    if(sensor_build_eng) {
+      sources += [
+        "hdi_connection/adapter/src/compatible_connection.cpp",
+      ]
+    }
 
     external_deps += [ "drivers_interface_sensor:libsensor_proxy_1.1" ]
   }
diff --git a/services/hdi_connection/adapter/src/compatible_connection.cpp b/services/hdi_connection/adapter/src/compatible_connection.cpp
index 8a2ef420..f878ecb8 100644
--- a/services/hdi_connection/adapter/src/compatible_connection.cpp
+++ b/services/hdi_connection/adapter/src/compatible_connection.cpp
@@ -12,7 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#ifdef BUILD_VARIANT_ENG
 #include "compatible_connection.h"
+#endif
 
 #include <cstring>
 
diff --git a/services/hdi_connection/interface/src/sensor_hdi_connection.cpp b/services/hdi_connection/interface/src/sensor_hdi_connection.cpp
index d4337a9c..86647cd8 100644
--- a/services/hdi_connection/interface/src/sensor_hdi_connection.cpp
+++ b/services/hdi_connection/interface/src/sensor_hdi_connection.cpp
@@ -14,7 +14,9 @@
  */
 #include "sensor_hdi_connection.h"
 
+#ifdef BUILD_VARIANT_ENG
 #include "compatible_connection.h"
+#endif
 #include "hdi_connection.h"
 #include "hitrace_meter.h"
 #include "sensor_errors.h"
@@ -43,13 +45,16 @@ int32_t SensorHdiConnection::ConnectHdi()
     int32_t ret = ConnectHdiService();
     if (ret != ERR_OK) {
         SEN_HILOGE("Connect hdi service failed, try to connect compatible connection, ret:%{public}d", ret);
-        iSensorHdiConnection_ = std::make_unique<CompatibleConnection>();
-        ret = ConnectHdiService();
-        if (ret != ERR_OK) {
-            SEN_HILOGE("Connect compatible connection failed, ret:%{public}d", ret);
-            return ret;
+            #ifdef BUILD_VARIANT_ENG
+            iSensorHdiConnection_ = std::make_unique<CompatibleConnection>();
+            ret = ConnectHdiService();
+            if (ret != ERR_OK) {
+                SEN_HILOGE("Connect compatible connection failed, ret:%{public}d", ret);
+                return ret;
+            }
+            hdiConnectionStatus_ = false;
+            #endif
         }
-        hdiConnectionStatus_ = false;
     } else {
         hdiConnectionStatus_ = true;
     }
@@ -83,6 +88,7 @@ int32_t SensorHdiConnection::ConnectHdiService()
     return ERR_OK;
 }
 
+#ifdef BUILD_VARIANT_ENG
 int32_t SensorHdiConnection::ConnectCompatibleHdi()
 {
     if (iSensorCompatibleHdiConnection_ == nullptr) {
@@ -95,6 +101,7 @@ int32_t SensorHdiConnection::ConnectCompatibleHdi()
     }
     return ERR_OK;
 }
+#endif
 
 bool SensorHdiConnection::FindAllInSensorSet(const std::unordered_set<int32_t> &sensors)
 {
-- 
Gitee


From cea63d6f6cf5c3b38fa872033c9afc5b401ff742 Mon Sep 17 00:00:00 2001
From: rwx1283129 <renxinyao2@huawei.com>
Date: Wed, 1 Nov 2023 06:23:53 +0000
Subject: [PATCH 2/2] add a signal

Signed-off-by: rwx1283129 <renxinyao2@huawei.com>
---
 sensor.gni | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sensor.gni b/sensor.gni
index fcb8420b..bd380a54 100644
--- a/sensor.gni
+++ b/sensor.gni
@@ -35,7 +35,7 @@ if (!defined(global_parts_info) ||
   hdf_drivers_interface_sensor = false
 }
 
-if(build_variant == "eng) {
+if(build_variant == "eng") {
   sensor_default_defines += [ "BUILD_VARIANT_ENG" ]
   sensor_build_eng = true;  
 }
-- 
Gitee