From ef79963b1c5a439a8524c0070143945032f204ac 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: Mon, 8 Sep 2025 15:47:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?OTA=E5=BC=82=E5=B8=B8=E5=9B=9E=E6=BB=9A?=
 =?UTF-8?q?=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 +
 interfaces/kits/include/slot_info/slot_info.h |  1 +
 interfaces/kits/slot_info/slot_info.cpp       | 18 +++++++++++++++---
 services/BUILD.gn                             |  1 +
 services/updater_main.cpp                     |  1 +
 5 files changed, 19 insertions(+), 3 deletions(-)

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/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/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/services/BUILD.gn b/services/BUILD.gn
index 1d822028..71b75225 100755
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -106,6 +106,7 @@ ohos_static_library("libupdater_static") {
     "openssl:libssl_shared",
     "zlib:libz",
     "drivers_peripheral_partitionslot:libpartition_slot_manager",
+    "init:libotainfo",
   ]
   if (updater_ui_support) {
     external_deps += [ "drivers_interface_input:libinput_proxy_1.0" ]
diff --git a/services/updater_main.cpp b/services/updater_main.cpp
index c4662f8a..a54c29b9 100644
--- a/services/updater_main.cpp
+++ b/services/updater_main.cpp
@@ -936,6 +936,7 @@ __attribute__((weak)) UpdaterStatus CheckAndSetSlot([[maybe_unused]]UpdaterParam
     LOG(INFO) << "not need check and set slot";
 #ifndef UPDATER_UT
     SetActiveSlot(); // UPDATER_AB_SUPPORT
+    SetOTACheckpoint(1); // init rollback
 #endif
     return UPDATE_SUCCESS;
 }
-- 
Gitee


From 7a1ea5ec9b285f9f04ba64c2bc6d0f287c33d93c 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: Wed, 10 Sep 2025 15:36:15 +0800
Subject: [PATCH 2/2] fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 甘罗宇 <ganluoyu@talkweb.com.cn>
---
 services/BUILD.gn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/BUILD.gn b/services/BUILD.gn
index 71b75225..1d822028 100755
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -106,7 +106,6 @@ ohos_static_library("libupdater_static") {
     "openssl:libssl_shared",
     "zlib:libz",
     "drivers_peripheral_partitionslot:libpartition_slot_manager",
-    "init:libotainfo",
   ]
   if (updater_ui_support) {
     external_deps += [ "drivers_interface_input:libinput_proxy_1.0" ]
-- 
Gitee