From 36d1988ff964ec40ec57f7674d03d7d5bd4f99db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=98=E7=BD=97=E5=AE=87?= <ganluoyu@talkweb.com.cn>
Date: Tue, 11 Mar 2025 16:44:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:OTA=E5=BC=82=E5=B8=B8=E5=9B=9E?=
 =?UTF-8?q?=E6=BB=9A=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 甘罗宇 <ganluoyu@talkweb.com.cn>
---
 OAT.xml                                       |   1 +
 bundle.json                                   |   9 ++
 interfaces/kits/include/ota_event/ota_event.h |  31 +++++
 interfaces/kits/include/slot_info/slot_info.h |   1 +
 interfaces/kits/ota_event/BUILD.gn            |  45 +++++++
 interfaces/kits/ota_event/ota_event.cpp       |  71 +++++++++++
 interfaces/kits/slot_info/slot_info.cpp       |  18 ++-
 test/unittest/BUILD.gn                        |  10 ++
 .../slot_info_test/slot_info_unittest.cpp     | 115 ++++++++++++++++++
 .../slot_info_test/slot_info_unittest.h       |  31 +++++
 10 files changed, 329 insertions(+), 3 deletions(-)
 create mode 100755 interfaces/kits/include/ota_event/ota_event.h
 create mode 100755 interfaces/kits/ota_event/BUILD.gn
 create mode 100755 interfaces/kits/ota_event/ota_event.cpp
 create mode 100755 test/unittest/slot_info_test/slot_info_unittest.cpp
 create mode 100755 test/unittest/slot_info_test/slot_info_unittest.h

diff --git a/OAT.xml b/OAT.xml
index 4e1bc72d..d3374be4 100755
--- a/OAT.xml
+++ b/OAT.xml
@@ -59,6 +59,7 @@ Note:If the text contains special characters, please escape them according to th
 		<licensefile></licensefile>  
         <policylist>
             <policy name="projectPolicy" desc="">
+                <policyitem type="copyright" name="Hunan OpenValley Digital Industry Development Co., Ltd." path=".*" rule="may" group="defaultGroup" filefilter="copyrightPolicyFilter" desc="Developed By OpenValley Digital Co., Ltd."/>
                 <!--policyitem type="compatibility" name="curl" path=".*" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter" desc=""/-->			
                 <!--policyitem type="compatibility" name="GPL-2.0+" path=".*" desc="不使用或者使用但是是独立进程，被X进程调用，自研进程不受GPL影响"/>			
                 <policyitem type="license" name="LGPL" path=".*" desc="未使用，或者使用了，被X进程以动态链接方式调用"/>
diff --git a/bundle.json b/bundle.json
index c997c816..ed593b92 100644
--- a/bundle.json
+++ b/bundle.json
@@ -320,6 +320,15 @@
                         "header_base": "//base/update/updater/interfaces/kits/include"
                     }
                 },
+                {
+                    "name": "//base/update/updater/interfaces/kits/ota_event:libotainfo",
+                    "header": {
+                        "header_files": [
+                            "ota_event/ota_event.h"
+                        ],
+                        "header_base": "//base/update/updater/interfaces/kits/include"
+                    }
+                },
                 {
                     "name": "//base/update/updater/services/script:libthreadpool",
                     "header": {
diff --git a/interfaces/kits/include/ota_event/ota_event.h b/interfaces/kits/include/ota_event/ota_event.h
new file mode 100755
index 00000000..c66821cf
--- /dev/null
+++ b/interfaces/kits/include/ota_event/ota_event.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+#ifndef OTA_EVENT_H
+#define OTA_EVENT_H
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif
+#endif
+
+int SetOTAStatus(int status);
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
+#endif /* SLOT_INFO_H */
diff --git a/interfaces/kits/include/slot_info/slot_info.h b/interfaces/kits/include/slot_info/slot_info.h
index fa92c546..f94cb242 100644
--- a/interfaces/kits/include/slot_info/slot_info.h
+++ b/interfaces/kits/include/slot_info/slot_info.h
@@ -24,5 +24,6 @@ namespace Updater {
 void GetPartitionSuffix(std::string &suffix);
 void GetActivePartitionSuffix(std::string &suffix);
 void SetActiveSlot();
+void SetOTACheckpoint(int32_t checkpoint);
 } // Updater
 #endif /* SLOT_INFO_H */
diff --git a/interfaces/kits/ota_event/BUILD.gn b/interfaces/kits/ota_event/BUILD.gn
new file mode 100755
index 00000000..851e8c9c
--- /dev/null
+++ b/interfaces/kits/ota_event/BUILD.gn
@@ -0,0 +1,45 @@
+# Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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.
+
+import("//base/update/updater/updater_default_cfg.gni")
+import("//build/ohos.gni")
+
+updater_path = rebase_path("${updater_absolutely_path}", ".")
+config("ota_event_exported_config") {
+  visibility = [ ":*" ]
+  include_dirs = [ "${updater_path}/interfaces/kits/include" ]
+}
+ohos_static_library("libotainfo") {
+  sources = [ "ota_event.cpp" ]
+
+  include_dirs = [
+    "${updater_path}/interfaces/kits/include",
+    "${updater_path}/services/include",
+    "${updater_path}/utils/include",
+    "//drivers/peripheral/partitionslot/hal/include/",
+  ]
+
+  deps = [
+    "${updater_path}/interfaces/kits/slot_info:libslotinfo",
+    "${updater_path}/services/log:libupdaterlog",
+  ]
+  public_configs = [ ":ota_event_exported_config" ]
+  if (init_feature_ab_partition) {
+    defines = [ "UPDATER_AB_SUPPORT" ]
+    external_deps =
+        [ "drivers_peripheral_partitionslot:libpartition_slot_manager" ]
+  }
+
+  subsystem_name = "updater"
+  part_name = "updater"
+}
diff --git a/interfaces/kits/ota_event/ota_event.cpp b/interfaces/kits/ota_event/ota_event.cpp
new file mode 100755
index 00000000..072a0245
--- /dev/null
+++ b/interfaces/kits/ota_event/ota_event.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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.
+ */
+
+#include "ota_event/ota_event.h"
+#include "log/log.h"
+#include <iostream>
+#include <string>
+#include <cstdint>
+#include "slot_info/slot_info.h"
+#ifdef UPDATER_AB_SUPPORT
+#include "partitionslot_manager.h"
+#endif
+
+#ifdef UPDATER_AB_SUPPORT
+enum ReturnSetOtaStatus {
+    SET_OTA_STATUS_FAILED = -1, // Failed to call SetOTAStatus to set information.
+    BOOT_SUCCESS_IN_OTA = 0,    // In the ota stage, startup is complete.
+    BOOT_SUCCESS_IN_NORMAL = 1, // In the non-ota stage, startup is complete.
+    BOOT_FAILD_IN_OTA = 2,      // In the ota stage, startup is failed.
+    BOOT_FAILD_IN_NORMAL = 3,   // In the non-ota stage, startup is failed.
+};
+int SetOTAStatus(int status)
+{
+    OHOS::HDI::Partitionslot::V1_1::PartitionSlotManager psMgr;
+    int32_t checkpoint = -1;
+
+    int32_t retGetcheckpoint = psMgr.GetCheckpoint(checkpoint);
+    if (retGetcheckpoint != 0 || checkpoint  == -1) {
+        return SET_OTA_STATUS_FAILED;
+    }
+    // In the ota stage, startup is failed
+    if (status == 0 && checkpoint == 1) {
+        // switch partition
+        Updater::SetActiveSlot();
+        // Write checkpoint=0 to prevent remounting the data partition the next time it is accessed
+        // Upgrade fails, reboot to do userdata rollback
+        int retSetcheckpoint = psMgr.SetCheckpoint(0);
+        if (retSetcheckpoint != 0) {
+            return SET_OTA_STATUS_FAILED;
+        }
+        return BOOT_FAILD_IN_OTA;
+    // In the ota stage, startup is complete.
+    } else if (status == 1 && checkpoint == 1) {
+        // Write checkpoint=0 to prevent remounting the data partition the next time it is accessed
+        int retSetcheckpoint = psMgr.SetCheckpoint(0);
+        if (retSetcheckpoint != 0) {
+            return SET_OTA_STATUS_FAILED;
+        }
+        return BOOT_SUCCESS_IN_OTA;
+    // In the non-ota stage, startup is complete
+    } else if (status == 1 && checkpoint == 0) {
+        return BOOT_SUCCESS_IN_NORMAL;
+    // In the non-ota stage, startup is failed
+    } else if (status == 0 && checkpoint == 0) {
+        return BOOT_FAILD_IN_NORMAL;
+    }
+    return SET_OTA_STATUS_FAILED;
+}
+#endif
\ No newline at end of file
diff --git a/interfaces/kits/slot_info/slot_info.cpp b/interfaces/kits/slot_info/slot_info.cpp
index e6f2787d..79d6cfb7 100644
--- a/interfaces/kits/slot_info/slot_info.cpp
+++ b/interfaces/kits/slot_info/slot_info.cpp
@@ -33,10 +33,13 @@ void GetActivePartitionSuffix(std::string &suffix)
 void SetActiveSlot()
 {
 }
+void SetOTACheckpoint(int32_t checkpoint)
+{
+}
 #else
 void GetPartitionSuffix(std::string &suffix)
 {
-    OHOS::HDI::Partitionslot::V1_0::PartitionSlotManager psMgr;
+    OHOS::HDI::Partitionslot::V1_1::PartitionSlotManager psMgr;
     int32_t curSlot = -1;
     int32_t numOfSlots = 0;
     int32_t ret = psMgr.GetCurrentSlot(curSlot, numOfSlots);
@@ -56,7 +59,7 @@ void GetPartitionSuffix(std::string &suffix)
 
 void GetActivePartitionSuffix(std::string &suffix)
 {
-    OHOS::HDI::Partitionslot::V1_0::PartitionSlotManager psMgr;
+    OHOS::HDI::Partitionslot::V1_1::PartitionSlotManager psMgr;
     int32_t curSlot = -1;
     int32_t numOfSlots = 0;
     int32_t ret = psMgr.GetCurrentSlot(curSlot, numOfSlots);
@@ -75,7 +78,7 @@ void GetActivePartitionSuffix(std::string &suffix)
 
 void SetActiveSlot()
 {
-    OHOS::HDI::Partitionslot::V1_0::PartitionSlotManager psMgr;
+    OHOS::HDI::Partitionslot::V1_1::PartitionSlotManager psMgr;
     int32_t curSlot = -1;
     int32_t numOfSlots = 0;
     int32_t ret = psMgr.GetCurrentSlot(curSlot, numOfSlots);
@@ -90,5 +93,14 @@ void SetActiveSlot()
         LOG(ERROR) << "Set active slot error, slot: " << activeSlot;
     }
 }
+
+void SetOTACheckpoint(int32_t checkpoint)
+{
+    OHOS::HDI::Partitionslot::V1_1::PartitionSlotManager psMgr;
+    int32_t ret = psMgr.SetCheckpoint(checkpoint);
+    if (ret!= 0) {
+        LOG(ERROR) << "Set checkpoint error, checkpoint: " << checkpoint;
+    }
+}
 #endif
 } // Updater
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index 727089de..cd1d595a 100755
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -67,6 +67,7 @@ ohos_unittest("updater_unittest") {
     "$root_out_dir/updater/updater/yacc/parser.cpp",
     "${updater_path}/interfaces/kits/misc_info/misc_info.cpp",
     "${updater_path}/interfaces/kits/packages/package.cpp",
+    "${updater_path}/interfaces/kits/slot_info/slot_info.cpp",
     "${updater_path}/interfaces/kits/updaterkits/updaterkits.cpp",
     "${updater_path}/services/diffpatch/bzip2/bzip2_adapter.cpp",
     "${updater_path}/services/diffpatch/bzip2/lz4_adapter.cpp",
@@ -180,6 +181,15 @@ ohos_unittest("updater_unittest") {
   install_enable = true
   part_name = "updater"
   defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ]
+  if (init_feature_ab_partition) {
+    defines += [ "UPDATER_AB_SUPPORT" ]
+    sources += [ "slot_info_test/slot_info_unittest.cpp" ]
+    include_dirs += [ "//drivers/peripheral/partitionslot/hal/include/" ]
+    deps += [
+      "${updater_path}/interfaces/kits/ota_event:libotainfo",
+      "${updater_path}/interfaces/kits/slot_info:libslotinfo",
+    ]
+  }
 }
 
 ohos_executable("test_update_binary") {
diff --git a/test/unittest/slot_info_test/slot_info_unittest.cpp b/test/unittest/slot_info_test/slot_info_unittest.cpp
new file mode 100755
index 00000000..b89fca56
--- /dev/null
+++ b/test/unittest/slot_info_test/slot_info_unittest.cpp
@@ -0,0 +1,115 @@
+/*
+* Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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.
+*/
+
+#include "slot_info_unittest.h"
+#include <iostream>
+#include <string>
+#include "slot_info/slot_info.h"
+#include "partitionslot_manager.h"
+#include "ota_event/ota_event.h"
+
+using namespace testing::ext;
+using namespace UpdaterUt;
+using namespace Updater;
+using namespace std;
+
+enum ReturnSetOtaStatus {
+    SET_OTA_STATUS_FAILED = -1, // Failed to call SetOTAStatus to set information.
+    BOOT_SUCCESS_IN_OTA = 0,    // In the ota stage, startup is complete.
+    BOOT_SUCCESS_IN_NORMAL = 1, // In the non-ota stage, startup is complete.
+    BOOT_FAILD_IN_OTA = 2,      // In the ota stage, startup is failed.
+    BOOT_FAILD_IN_NORMAL = 3,   // In the non-ota stage, startup is failed.
+};
+
+namespace UpdaterUt {
+void SlotInfoUnitTest::SetUpTestCase(void)
+{
+    cout << "Updater Unit OTAfunUnitTest Begin!" << endl;
+}
+
+void SlotInfoUnitTest::TearDownTestCase(void)
+{
+    cout << "Updater Unit OTAfunUnitTest End!" << endl;
+}
+
+HWTEST_F(SlotInfoUnitTest, slot_info_test_001, TestSize.Level1)
+{
+    EXPECT_NO_THROW(SetActiveSlot());
+}
+
+HWTEST_F(SlotInfoUnitTest, slot_info_test_002, TestSize.Level1)
+{
+    int32_t checkpoint = 1;
+    EXPECT_NO_THROW(SetOTACheckpoint(checkpoint));
+
+    checkpoint = 0;
+    EXPECT_NO_THROW(SetOTACheckpoint(checkpoint));
+
+    checkpoint = -1;
+    EXPECT_NO_THROW(SetOTACheckpoint(checkpoint));
+}
+
+HWTEST_F(SlotInfoUnitTest, slot_info_test_003, TestSize.Level1)
+{
+    // Simulating OTA phase, boot failed, checkpoint is 1
+    OHOS::HDI::Partitionslot::V1_1::PartitionSlotManager psMgr;
+    int status = 0;
+    int32_t checkpoint = 1;
+    int32_t ret = psMgr.SetCheckpoint(checkpoint);
+    EXPECT_EQ(ret, 0);
+    int expectedResult = BOOT_FAILD_IN_OTA;
+    int actualResult = SetOTAStatus(status);
+    EXPECT_EQ(actualResult, expectedResult);
+}
+
+HWTEST_F(SlotInfoUnitTest, slot_info_test_004, TestSize.Level1)
+{
+    // Simulation of non-OTA phase, boot failed, checkpoint is 0
+    OHOS::HDI::Partitionslot::V1_1::PartitionSlotManager psMgr;
+    int status = 0;
+    int32_t checkpoint = 0;
+    int32_t ret = psMgr.SetCheckpoint(checkpoint);
+    EXPECT_EQ(ret, 0);
+    int expectedResult = BOOT_FAILD_IN_NORMAL;
+    int actualResult = SetOTAStatus(status);
+    EXPECT_EQ(actualResult, expectedResult);
+}
+
+HWTEST_F(SlotInfoUnitTest, slot_info_test_005, TestSize.Level1)
+{
+    // Simulated OTA phase, boot successful, checkpoint is 1
+    OHOS::HDI::Partitionslot::V1_1::PartitionSlotManager psMgr;
+    int status = 1;
+    int32_t checkpoint = 1;
+    int32_t ret = psMgr.SetCheckpoint(checkpoint);
+    EXPECT_EQ(ret, 0);
+    int expectedResult = BOOT_SUCCESS_IN_OTA;
+    int actualResult = SetOTAStatus(status);
+    EXPECT_EQ(actualResult, expectedResult);
+}
+
+HWTEST_F(SlotInfoUnitTest, slot_info_test_006, TestSize.Level1)
+{
+    // Simulated OTA phase, boot successful, checkpoint 0
+    OHOS::HDI::Partitionslot::V1_1::PartitionSlotManager psMgr;
+    int status = 1;
+    int32_t checkpoint = 0;
+    int32_t ret = psMgr.SetCheckpoint(checkpoint);
+    EXPECT_EQ(ret, 0);
+    int expectedResult = BOOT_SUCCESS_IN_NORMAL;
+    int actualResult = SetOTAStatus(status);
+    EXPECT_EQ(actualResult, expectedResult);
+}
+}
diff --git a/test/unittest/slot_info_test/slot_info_unittest.h b/test/unittest/slot_info_test/slot_info_unittest.h
new file mode 100755
index 00000000..43dff9b1
--- /dev/null
+++ b/test/unittest/slot_info_test/slot_info_unittest.h
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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.
+*/
+
+#ifndef SLOT_INFO_UNITTEST_H
+#define SLOT_INFO_UNITTEST_H
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace UpdaterUt {
+class SlotInfoUnitTest : public testing::Test {
+public:
+    static void SetUpTestCase(void);
+    static void TearDownTestCase(void);
+    void SetUp() {};
+    void TearDown() {};
+};
+} // updater_ut
+#endif /* SLOT_INFO_UNITTEST_H */
\ No newline at end of file
-- 
Gitee


From f642e6d4cb06a15e2f5010d61169899ec0bf99ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=98=E7=BD=97=E5=AE=87?= <ganluoyu@talkweb.com.cn>
Date: Tue, 11 Mar 2025 17:12:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AEcheckpoint=3D1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 甘罗宇 <ganluoyu@talkweb.com.cn>
---
 services/stream_update/bin_chunk_update.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/stream_update/bin_chunk_update.cpp b/services/stream_update/bin_chunk_update.cpp
index 5a7736e9..87f2b807 100755
--- a/services/stream_update/bin_chunk_update.cpp
+++ b/services/stream_update/bin_chunk_update.cpp
@@ -217,6 +217,7 @@ UpdateResultCode BinChunkUpdate::UpdateBinHash(uint8_t *data, uint32_t &len)
     //切换ab分区
     #ifndef UPDATER_UT
     SetActiveSlot();
+    SetOTACheckpoint(1);
     #else
     int result = remove("/data/updater/test.txt");
     if (result != 0) {
-- 
Gitee