commit ad55fad080299147f8b3e0622291fb26912e5d13
author Akilesh Kailash <akailash@google.com> Mon Mar 25 21:15:08 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 25 21:15:08 2024 +0000
tree d421111105fd30c4e1916325156e305baf6b5203
parent da9db4f396a0cb94a25104d010878558baf500f3
parent 35d5c94bb064f5f93bb8090cf39c20c842ea0fbe

Merge "libsnapshot: Enable snapshots during OTA install for S vendor" into main

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index b4892b4..6d344bd 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -3288,8 +3288,11 @@
         }
     }
 
-    LOG(INFO) << "userspace snapshots: " << userspace_snapshots
-              << " legacy_snapuserd: " << legacy_compression;
+    if (!userspace_snapshots && is_legacy_snapuserd && legacy_compression) {
+        userspace_snapshots = true;
+        LOG(INFO) << "Vendor from Android 12. Enabling userspace snapshot for OTA install";
+    }
+
     const bool using_snapuserd = userspace_snapshots || legacy_compression;
     if (!using_snapuserd) {
         LOG(INFO) << "Using legacy Virtual A/B (dm-snapshot)";
@@ -3389,6 +3392,7 @@
         }
 
         if (is_legacy_snapuserd) {
+            LOG(INFO) << "Setting legacy_snapuserd to true";
             status.set_legacy_snapuserd(true);
         }
     } else if (legacy_compression) {